diff --git a/Manifest b/Manifest
index 3d9619ec1937..aa3ab7370757 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29461 BLAKE2B e765a6f09410bab71adefa667cc274b658929ce507eb94f8e1ee3e9905edffed35a6147755f9e15e2ca11a8041a3aea82172a10cbf0511ddb7421015da5e87b3 SHA512 d438e9453226714b1c68ece41d191351346addc72042c122ba3503fa604cba6bf5421b59b23cd8deef0ad5fc0afe08d9c420addfe4a0ff79cd68283aef3373c4
-TIMESTAMP 2020-07-07T09:08:28Z
+MANIFEST Manifest.files.gz 29421 BLAKE2B f84a170f7c09d30ce1ec9da2c9bd323a4c22904f6ea25813d77d1c2e6269d0d94b4b1fec6aa30f692a9b9673ddbf4d694d34422a2f0175049db3214a0951de0f SHA512 697b2075bb0cea251bccdde4f789591efbac601f406f10d07133ed143436db878e345a94180454eca910db0c431d983da7d275b243f5aa05fdf7f401def561b1
+TIMESTAMP 2020-07-10T09:08:23Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8EO4xfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8IMAdfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBEDA//RffZMytmOpo6n8Q3/iT6U2Qsju6R+/3pQN09uPHjUVsofiEi5IwruXaD
-VqvH/yqsKoscWwPhPHaIdwzfbOabcfQCMgqk4hld2WSP/jCrgmSnm3NaP6xmq8DY
-772Tpwb933V1BVXslQkeAq1VlSynIfoG/5bCPa+sR8nMNdiX88b6UG0PZmuT/lA1
-ef+gSXMXjyzxcO7Hb9s8E8qbERGl/rXE1dh4nV0xD6bIH2EQXLFfiv1GXnNY4nGs
-YQJtEmd2E3lqyAJVe2muigLsobR0ETbDVpj/iYfjb9pw6PH3KL0G0CBoangIrjHD
-+Q8rixTjJoJbZ1LCabyJ23XB25pcCP7JGXDcImCbrKIg9X1V/nbxA/i1poLnCGes
-9wriJmQHjzH1pcZzenv0cO6JhZkCCyuqYgNd6zYVvpqO6DlCQQWSM6BtsNkWfzEs
-Ut6qPXHMJW7HMmC9vt40BzIF7PqEA1OMz2t7BEVk/HchjL1wGIBLWTrxUoev0WwV
-hG+COPMdFJpBon63Ep5U6130HSfCmfxryeieM00Ce1cWSqRZIRe2vVP6/alIfutb
-WFymldac0Psm3uoTq41DSS+TVctqEcb6UXVtBM5H7HpDLMEUZnhWwSht4MxFmKO9
-+k+ZCtHaMNlEs77s47v7YbFdX5b8fi0hR4IjxstoAIG1LOnqsmo=
-=WLsR
+klBWrQ/9FepYaoeJjIW6PzwA6GNxro1LpSHOyp58Rfv+I49Tjpe9NSzCnQSSCQ12
+Ihjj64+9zUsSSgpr4CfWhNHf7zHlRdoDEgCScJcsmrJlOkNrIYb0eS/dYrwt43p1
+2jtbd4KnjpxvdmcyObxGY+n4+QMdLVieYOMjTXA8eJxiE66/wqD8h2pv+4J8KYKn
+VNQuKW906Werko/VEPSg75Il4TqikBelea9DduL9qVgfW3NFMRJc38K6WEZE8Nly
+0io/FfJU+f5RZHPSowj81+fiT1NA+voxtyMujpkk4TIgidVyBck2DJ7ha5Fcn9LF
+86kXn3P/NkJGR5QiSU651AaVifBhHwYxfrqPsB0j6Ocf+wl0e55OBxZjvNmZiSWH
+1cv8LcuWmQ7yDq59XVo7Mp1PxDPW59rR0YosN4FusXE9L/1wQjRwHMU35Ucz2Pr0
+JC0qiTI10ugRjg8hCIR4aCE0ybg/rUJxD5IhL/fb4I4cYsJOMeqbTdri61v0WQHE
+xzf+Pol3MqsxsRkBI4oFXGVJ/DojMltLb70WVEdBuvqnehXwToCKaN07caaKWAbs
+w44+goaJERPwSLtHtc4MAKqrr2qhln/D36wsyobY2BdFI2foed5cB/+xxfwJkfkh
+OvR4jNAHk1uG1yjvzAJsOobSmmUIxn6KR17a34YVFl/x3jVxUvc=
+=Rxeb
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d1e35bc63f7d..240d1917d8fc 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index a205e606deee..1a986c0ef522 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/anope/Manifest b/acct-group/anope/Manifest
index 495409ea543f..16823a3ea83a 100644
--- a/acct-group/anope/Manifest
+++ b/acct-group/anope/Manifest
@@ -1,2 +1,2 @@
EBUILD anope-0.ebuild 189 BLAKE2B bbcb6710a6731e901ce8727b45a569cd70689459a8ce99521f92b35be10d7f314d312595da3faabae94f262e25340120b6b04d97cd5366b9afebbe011a25a0e3 SHA512 1a1a229859c7dc323df42c5e94bacb7c514d22d5bd8557799928d9ac1f62720bdb2f7d776c421197ad51a6b4c9033e996c778b27bea5efbaccf489813bd77ca5
-MISC metadata.xml 356 BLAKE2B 579b76bca3cc904a43822723c8b563ea995f6848a7d47bed3a582aff2b7ad2f35c4b10a2d94767c59cc44584a5f4cb051526d47b00831bddd45512ed5683ddc0 SHA512 d212a403a6ac0cb9dac4941767830f47fc171718363b5e12c196d8fa72bf2e134444239e190241aafca7a616faea3b72a99dd988c84965fb9accd1014cc08796
+MISC metadata.xml 239 BLAKE2B b6b1bf74f7f8bfb011e7281aed3fdd6384559b2ca489081ec5f76e8e150d4864cf8ace9109e490dcff07235e4eb009f2f07a0f7f1ab8b59700d2365f1c89cb80 SHA512 bc4dcbc277db158ba204153e2ee8b7de6db5fe7fa2b7abaff141da65d8b04b773e04526c94d7c824b57be06359e226a0b48479cf6f208eacb239c1a2f893b4be
diff --git a/acct-group/anope/metadata.xml b/acct-group/anope/metadata.xml
index 591b1da5e31a..6356cbc03fb9 100644
--- a/acct-group/anope/metadata.xml
+++ b/acct-group/anope/metadata.xml
@@ -2,11 +2,7 @@
- sam@cmpct.info
+ sam@gentoo.org
Sam James
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-group/dnscrypt-proxy/Manifest b/acct-group/dnscrypt-proxy/Manifest
index b96ee7e0d534..851b14d530f6 100644
--- a/acct-group/dnscrypt-proxy/Manifest
+++ b/acct-group/dnscrypt-proxy/Manifest
@@ -1,2 +1,2 @@
EBUILD dnscrypt-proxy-0.ebuild 193 BLAKE2B dd8271fcdb848bcb9088c3edce788f94f350a6d71daf19f51be020b7418538a2644832aaddca7bbdcb6633f3c968fbfa5ca12d5420e0908964c9163b86dea915 SHA512 f4b370766925062f07cc35bb7f90190289b8516bd283cf0fbea80d7c137aa3f4329028cd56f4cd1483ac5e984b44d1fdaeb9dedee5442e4e1ab22dc1ba5a165d
-MISC metadata.xml 468 BLAKE2B 6415d2640c70c3dea062081796fd23806bffa0cca138c7b61d402e2b2b169732d2d40096ed54cd769c77130e1254b3a6208c12344ffb97a71e289e9700ca62c8 SHA512 caf0b3b209dbb981a1c96700801ed0a34b14cc97e871185a16dfa1163e0081cc7ff8ba7ca259db5d58ba417f346a726e733bb69af6f7d54fd96eefd85ca55c76
+MISC metadata.xml 351 BLAKE2B ff2b8229c82ecfa30b5bbdc8eba1a4da58a77bb9cbbf60bc079d9ecb668cdfaabe97a6a89e27cb5430929429ceec0d46b9b9c0dbfdb8f072b0f571600114d29f SHA512 9038ed6c278b96614b1c7e82d2573ae5eeb9811043e0f384f96d35297df123a0ff801aa25dd6aef27a47e1480fcafea7436fd5becea47300b84e4970d8320bd6
diff --git a/acct-group/dnscrypt-proxy/metadata.xml b/acct-group/dnscrypt-proxy/metadata.xml
index 33af2c3f8213..fd9e2163ba5d 100644
--- a/acct-group/dnscrypt-proxy/metadata.xml
+++ b/acct-group/dnscrypt-proxy/metadata.xml
@@ -2,15 +2,11 @@
- sam@cmpct.info
+ sam@gentoo.org
Sam James
gyakovlev@gentoo.org
Georgy Yakovlev
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-group/ngircd/Manifest b/acct-group/ngircd/Manifest
index ca425be028e4..b42054264d60 100644
--- a/acct-group/ngircd/Manifest
+++ b/acct-group/ngircd/Manifest
@@ -1,2 +1,2 @@
EBUILD ngircd-0.ebuild 190 BLAKE2B 14379ac3de7b681361b315f037527e92b0207f0fc3df4aceb0fcbbc0da52060650acb8676c43ad3bd30d06cf50463fd543ad4491b87e03349a086988ae4df8e6 SHA512 4a07a3b2651941f8bf06e233b88ee623fae346de7ff086d1fc70f26f7fe9abed994501456e13b876d8f1d37dd5f678ebf41918a3b9021ea3476c2a07a82a1289
-MISC metadata.xml 356 BLAKE2B 579b76bca3cc904a43822723c8b563ea995f6848a7d47bed3a582aff2b7ad2f35c4b10a2d94767c59cc44584a5f4cb051526d47b00831bddd45512ed5683ddc0 SHA512 d212a403a6ac0cb9dac4941767830f47fc171718363b5e12c196d8fa72bf2e134444239e190241aafca7a616faea3b72a99dd988c84965fb9accd1014cc08796
+MISC metadata.xml 239 BLAKE2B b6b1bf74f7f8bfb011e7281aed3fdd6384559b2ca489081ec5f76e8e150d4864cf8ace9109e490dcff07235e4eb009f2f07a0f7f1ab8b59700d2365f1c89cb80 SHA512 bc4dcbc277db158ba204153e2ee8b7de6db5fe7fa2b7abaff141da65d8b04b773e04526c94d7c824b57be06359e226a0b48479cf6f208eacb239c1a2f893b4be
diff --git a/acct-group/ngircd/metadata.xml b/acct-group/ngircd/metadata.xml
index 591b1da5e31a..6356cbc03fb9 100644
--- a/acct-group/ngircd/metadata.xml
+++ b/acct-group/ngircd/metadata.xml
@@ -2,11 +2,7 @@
- sam@cmpct.info
+ sam@gentoo.org
Sam James
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 1ef9620b7b8f..9b4090e96129 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/anope/Manifest b/acct-user/anope/Manifest
index 6b0a705f44a3..9f51e389047c 100644
--- a/acct-user/anope/Manifest
+++ b/acct-user/anope/Manifest
@@ -1,2 +1,2 @@
EBUILD anope-0.ebuild 233 BLAKE2B ccdda7dd529edcfb22d6e889bfd93d634a501a88689a12e12a24944a550002f4f9e07ffebbe17d521f97d6ffd1e45ee035de936ea0013deb4624f1182f96df92 SHA512 24ceef50af0cf3e3c783fa5f22b48b001ca6be7fb9aba92342cc5474b1b406324e7e621e96bfbb07de3f720d73ea0205a53730e90ff09f494d4a396b9417280b
-MISC metadata.xml 356 BLAKE2B 579b76bca3cc904a43822723c8b563ea995f6848a7d47bed3a582aff2b7ad2f35c4b10a2d94767c59cc44584a5f4cb051526d47b00831bddd45512ed5683ddc0 SHA512 d212a403a6ac0cb9dac4941767830f47fc171718363b5e12c196d8fa72bf2e134444239e190241aafca7a616faea3b72a99dd988c84965fb9accd1014cc08796
+MISC metadata.xml 239 BLAKE2B b6b1bf74f7f8bfb011e7281aed3fdd6384559b2ca489081ec5f76e8e150d4864cf8ace9109e490dcff07235e4eb009f2f07a0f7f1ab8b59700d2365f1c89cb80 SHA512 bc4dcbc277db158ba204153e2ee8b7de6db5fe7fa2b7abaff141da65d8b04b773e04526c94d7c824b57be06359e226a0b48479cf6f208eacb239c1a2f893b4be
diff --git a/acct-user/anope/metadata.xml b/acct-user/anope/metadata.xml
index 591b1da5e31a..6356cbc03fb9 100644
--- a/acct-user/anope/metadata.xml
+++ b/acct-user/anope/metadata.xml
@@ -2,11 +2,7 @@
- sam@cmpct.info
+ sam@gentoo.org
Sam James
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-user/dnscrypt-proxy/Manifest b/acct-user/dnscrypt-proxy/Manifest
index cb7537ddad32..a9528a863d88 100644
--- a/acct-user/dnscrypt-proxy/Manifest
+++ b/acct-user/dnscrypt-proxy/Manifest
@@ -1,2 +1,2 @@
EBUILD dnscrypt-proxy-0.ebuild 246 BLAKE2B 4366f7c575543915b0f2b880532c19ec002463c0ed31360f31c860cfecc035e7c01b4c499847ebbddb728cf4e4d6a8931ed5107a52732f092007ea4544154f4c SHA512 15103f157e400714709efe4c5bdb2e74a07687ed93703ad0ff6e56c6ee7efd02df068d4b73c519c674ec2ded2734c9e697f604c230a7cb1be7110a0a24030f84
-MISC metadata.xml 468 BLAKE2B 6415d2640c70c3dea062081796fd23806bffa0cca138c7b61d402e2b2b169732d2d40096ed54cd769c77130e1254b3a6208c12344ffb97a71e289e9700ca62c8 SHA512 caf0b3b209dbb981a1c96700801ed0a34b14cc97e871185a16dfa1163e0081cc7ff8ba7ca259db5d58ba417f346a726e733bb69af6f7d54fd96eefd85ca55c76
+MISC metadata.xml 351 BLAKE2B ff2b8229c82ecfa30b5bbdc8eba1a4da58a77bb9cbbf60bc079d9ecb668cdfaabe97a6a89e27cb5430929429ceec0d46b9b9c0dbfdb8f072b0f571600114d29f SHA512 9038ed6c278b96614b1c7e82d2573ae5eeb9811043e0f384f96d35297df123a0ff801aa25dd6aef27a47e1480fcafea7436fd5becea47300b84e4970d8320bd6
diff --git a/acct-user/dnscrypt-proxy/metadata.xml b/acct-user/dnscrypt-proxy/metadata.xml
index 33af2c3f8213..fd9e2163ba5d 100644
--- a/acct-user/dnscrypt-proxy/metadata.xml
+++ b/acct-user/dnscrypt-proxy/metadata.xml
@@ -2,15 +2,11 @@
- sam@cmpct.info
+ sam@gentoo.org
Sam James
gyakovlev@gentoo.org
Georgy Yakovlev
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-user/ngircd/Manifest b/acct-user/ngircd/Manifest
index aa30727e24fa..be3bdc54d263 100644
--- a/acct-user/ngircd/Manifest
+++ b/acct-user/ngircd/Manifest
@@ -1,2 +1,2 @@
EBUILD ngircd-0.ebuild 235 BLAKE2B cfaf08dd4e18736d778a87fc69c9bb97fc32e888401dc5f3dcf2c77d131e61c376414b3059458088e0006649539226dd10ad1491806fd7fc974656d6e5209bd8 SHA512 1c16d85946ebc58cc79aa26c8ed1903bd330eb2e0fd0ef089fd2dc35115bf6beb696eb2d0b81f1173e9be362795e0d9f32459d5ca4b7d795ee4ca7fd459415e9
-MISC metadata.xml 356 BLAKE2B 579b76bca3cc904a43822723c8b563ea995f6848a7d47bed3a582aff2b7ad2f35c4b10a2d94767c59cc44584a5f4cb051526d47b00831bddd45512ed5683ddc0 SHA512 d212a403a6ac0cb9dac4941767830f47fc171718363b5e12c196d8fa72bf2e134444239e190241aafca7a616faea3b72a99dd988c84965fb9accd1014cc08796
+MISC metadata.xml 239 BLAKE2B b6b1bf74f7f8bfb011e7281aed3fdd6384559b2ca489081ec5f76e8e150d4864cf8ace9109e490dcff07235e4eb009f2f07a0f7f1ab8b59700d2365f1c89cb80 SHA512 bc4dcbc277db158ba204153e2ee8b7de6db5fe7fa2b7abaff141da65d8b04b773e04526c94d7c824b57be06359e226a0b48479cf6f208eacb239c1a2f893b4be
diff --git a/acct-user/ngircd/metadata.xml b/acct-user/ngircd/metadata.xml
index 591b1da5e31a..6356cbc03fb9 100644
--- a/acct-user/ngircd/metadata.xml
+++ b/acct-user/ngircd/metadata.xml
@@ -2,11 +2,7 @@
- sam@cmpct.info
+ sam@gentoo.org
Sam James
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 9866550d52c8..2796119d716a 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 1c5998827b55..047cefaeb87c 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,9 +1,7 @@
AUX keepassxc-2.5.2-ccache_switch.patch 2274 BLAKE2B 640bd0bdbd56aa93a3f7d70b4827b50639bcf6cea1cb0339ec78b91cbd4ab7c364bd36353ccc02e88b438566ecbad6545124bf5fd89c2c8e766c723e278ba1c9 SHA512 5b43fe2e5dea3ff3626ae4b75faa8aa4666a2703d08a30c4a18fd2b1079a73ad033d8788f05e28b860f51ef42e9f1a65253319b9d8fe0c34ec058b9ffb59dfea
-DIST keepassxc-2.5.3-src.tar.xz 6839148 BLAKE2B b3cc32f9abb42e662edec0c28967fca65a4f3c794f70bfe6c40c39375cad8cbc35eba95431b33119268230a324f83f2e5a53186ee8fc64cd366e20eac1341dc5 SHA512 8b1e3360b4ae5de170be6936291f7b309de09b2462fcd5a48f239c22f1c8b6ffe721aca8d1e9b6ae3881f7b16374850d7f4b809733244fd16d45eed6ad4f60c6
DIST keepassxc-2.5.4-src.tar.xz 6839396 BLAKE2B 5f7f415cab73c2665e3dff94c2bde039096b04a6e8e8a6ff4fe40d31cf4c6ff789f72d8c4c18ae0325c6db570933110a65348c4c359acadd2c89617435ffd6bd SHA512 8a70363dd579b95ccb05cb846aa34a5ed89de4305f3bef9e518e5986fe7f0313cb1daaa347f5b2267002f3fff4b71c87f5bb9073f6e6879d2556a2f0e4791dd3
-DIST keepassxc-2.6.0_beta1.tar.gz 8445948 BLAKE2B 46c84d547e621b69ba6e609c75584aec3b6347c1ef8f455c8b69c7bc23f3b87eefcd0c53e595a3ef47f49c4b2bf0f550f11639397b3e511ec515958620992fcd SHA512 7d52c3ac8c1803683a8926282e960d08cba18335a0f5f8a08e6950deb48e570a904f8cc23c7f7ab67e1e398b1dafe829cecdf532fc82e60d61ec5c02bf17b498
-EBUILD keepassxc-2.5.3.ebuild 2183 BLAKE2B 68019fba5936cecc2f48e3c3ea5fb8f24e3385d5cc80f36fde0d7bea796d01c823d338c8d08600cd291cea880c57e78d3b7d20bfc32021598a05c32cb3a212e6 SHA512 b8c4efb3e662085c87357e65355a9b1957bdf06c265668d84cf071ed024f1f4d9f8083cf62f1f8882ef7ce5d44411764895d78e20c2f32c0ab44929f2662c80b
+DIST keepassxc-2.6.0-src.tar.xz 5628800 BLAKE2B 9872b9fa5f809e2d2e6ed4a233ca248d19ada1c495f4c8febdfa765565963a01a5ede97d1f3830a39a6dc1063f88cb77b9b216776767111686288284aae63399 SHA512 c1ddf81f965f5521db8b8acb2fe3950c7b185ca459c440c9118f3d6350eeff6f15bb488f9e3bd034bdf80c515f0753c041e3af083d62e179cd16df7bb8326e17
EBUILD keepassxc-2.5.4.ebuild 2190 BLAKE2B 4e23b212cf03f1a5c8bc18dc63313ea5224bf76efc29f360cf013af90e9fc745b04754170f5e88bacf4bc5c4600203dc9b706a2412d07e4e21b172f96822319a SHA512 9080c0202fd22e83ab38741edc4ab3061e4a24d2a3735ce03c4194faa8588ea719221296e663079a007f3f49e757ef7efcd7e206341e542054d937f3908d73ab
-EBUILD keepassxc-2.6.0_beta1.ebuild 2125 BLAKE2B de716370e41031cc3e9f373273a9360ad91ececa2272a0bc569edb771b54b6fedae04f25cdaa49c0441ee791b6d12c8c0b8e48a9d3a0c57e33c856381e9bcf8d SHA512 58882ac9cad8670f2f95ef0a41d238899eae9a17c0e145912e89f82799570f8be9b55bbcbd14efd3befe22317f3a27162c751c3ba37e360396fa329fb017dd70
-EBUILD keepassxc-9999.ebuild 2125 BLAKE2B de716370e41031cc3e9f373273a9360ad91ececa2272a0bc569edb771b54b6fedae04f25cdaa49c0441ee791b6d12c8c0b8e48a9d3a0c57e33c856381e9bcf8d SHA512 58882ac9cad8670f2f95ef0a41d238899eae9a17c0e145912e89f82799570f8be9b55bbcbd14efd3befe22317f3a27162c751c3ba37e360396fa329fb017dd70
+EBUILD keepassxc-2.6.0.ebuild 2064 BLAKE2B 21546c5edd6287bd30a39d2a491ce1b0f010a12e77a8453bcad8d3f5e565786aed48669004230dd4625e71c7485961532394da98e1ac99d534311a3a8a012417 SHA512 1899b53dca25d584f71badaefdee9087191fd30f0f1fa97169b0e9e1b0667fbf21dee4b09b5437ce91ac70dd182ac80cf6c47ec757f2dea02b8ecb952ef74323
+EBUILD keepassxc-9999.ebuild 2064 BLAKE2B 21546c5edd6287bd30a39d2a491ce1b0f010a12e77a8453bcad8d3f5e565786aed48669004230dd4625e71c7485961532394da98e1ac99d534311a3a8a012417 SHA512 1899b53dca25d584f71badaefdee9087191fd30f0f1fa97169b0e9e1b0667fbf21dee4b09b5437ce91ac70dd182ac80cf6c47ec757f2dea02b8ecb952ef74323
MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e
diff --git a/app-admin/keepassxc/keepassxc-2.5.3.ebuild b/app-admin/keepassxc/keepassxc-2.5.3.ebuild
deleted file mode 100644
index fa1a828a2cc5..000000000000
--- a/app-admin/keepassxc/keepassxc-2.5.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != 9999 ]] ; then
- if [[ "${PV}" == *_beta* ]] ; then
- SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${P/_/-}"
- else
- #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
- SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
- KEYWORDS="amd64 x86"
- fi
-else
- inherit git-r3
- EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser ccache debug keeshare +network test yubikey"
-
-RDEPEND="
- app-crypt/argon2:=
- dev-libs/libgcrypt:=
- >=dev-libs/libsodium-1.0.12:=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- media-gfx/qrencode:=
- sys-libs/readline:0=
- sys-libs/zlib:=
- autotype? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXtst
- )
- keeshare? ( dev-libs/quazip )
- yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
- ${RDEPEND}
- dev-qt/linguist-tools:5
- dev-qt/qttest:5
-"
-BDEPEND="
- ccache? ( dev-util/ccache )
-"
-# Not a runtime dependency but still needed (see bug #667092)
-PDEPEND="
- x11-misc/xsel
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.5.2-ccache_switch.patch"
-)
-
-src_prepare() {
- use test || \
- sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_CCACHE="$(usex ccache)"
- -DWITH_GUI_TESTS=OFF
- -DWITH_TESTS="$(usex test)"
- -DWITH_XC_AUTOTYPE="$(usex autotype)"
- -DWITH_XC_BROWSER="$(usex browser)"
- -DWITH_XC_FDOSECRETS=ON
- -DWITH_XC_KEESHARE="$(usex keeshare)"
- -DWITH_XC_NETWORKING="$(usex network)"
- -DWITH_XC_SSHAGENT=ON
- -DWITH_XC_UPDATECHECK=OFF
- -DWITH_XC_YUBIKEY="$(usex yubikey)"
- )
- if [[ "${PV}" == *_beta* ]] ; then
- mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
- fi
- cmake_src_configure
-}
diff --git a/app-admin/keepassxc/keepassxc-2.6.0.ebuild b/app-admin/keepassxc/keepassxc-2.6.0.ebuild
new file mode 100644
index 000000000000..a6d25729d322
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.6.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org"
+
+if [[ "${PV}" != 9999 ]] ; then
+ if [[ "${PV}" == *_beta* ]] ; then
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${P/_/-}"
+ else
+ #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ fi
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype browser ccache debug keeshare +network test yubikey"
+
+RDEPEND="
+ app-crypt/argon2:=
+ dev-libs/libgcrypt:=
+ >=dev-libs/libsodium-1.0.12:=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ media-gfx/qrencode:=
+ sys-libs/readline:0=
+ sys-libs/zlib:=
+ autotype? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXtst
+ )
+ keeshare? ( dev-libs/quazip )
+ yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-qt/linguist-tools:5
+ dev-qt/qttest:5
+"
+BDEPEND="
+ ccache? ( dev-util/ccache )
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+ use test || \
+ sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_CCACHE="$(usex ccache)"
+ -DWITH_GUI_TESTS=OFF
+ -DWITH_TESTS="$(usex test)"
+ -DWITH_XC_AUTOTYPE="$(usex autotype)"
+ -DWITH_XC_DOCS=OFF
+ -DWITH_XC_BROWSER="$(usex browser)"
+ -DWITH_XC_FDOSECRETS=ON
+ -DWITH_XC_KEESHARE="$(usex keeshare)"
+ -DWITH_XC_NETWORKING="$(usex network)"
+ -DWITH_XC_SSHAGENT=ON
+ -DWITH_XC_UPDATECHECK=OFF
+ -DWITH_XC_YUBIKEY="$(usex yubikey)"
+ )
+ if [[ "${PV}" == *_beta* ]] ; then
+ mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+ fi
+ cmake_src_configure
+}
diff --git a/app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild b/app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild
deleted file mode 100644
index 949cb61dc8aa..000000000000
--- a/app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != 9999 ]] ; then
- if [[ "${PV}" == *_beta* ]] ; then
- SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${P/_/-}"
- else
- #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
- SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
- KEYWORDS="~amd64 ~x86"
- fi
-else
- inherit git-r3
- EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser ccache debug keeshare +network test yubikey"
-
-RDEPEND="
- app-crypt/argon2:=
- dev-libs/libgcrypt:=
- >=dev-libs/libsodium-1.0.12:=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- media-gfx/qrencode:=
- sys-libs/readline:0=
- sys-libs/zlib:=
- autotype? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXtst
- )
- keeshare? ( dev-libs/quazip )
- yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
- ${RDEPEND}
- dev-qt/linguist-tools:5
- dev-qt/qttest:5
-"
-BDEPEND="
- ccache? ( dev-util/ccache )
-"
-# Not a runtime dependency but still needed (see bug #667092)
-PDEPEND="
- x11-misc/xsel
-"
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
- use test || \
- sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_CCACHE="$(usex ccache)"
- -DWITH_GUI_TESTS=OFF
- -DWITH_TESTS="$(usex test)"
- -DWITH_XC_AUTOTYPE="$(usex autotype)"
- -DWITH_XC_BROWSER="$(usex browser)"
- -DWITH_XC_FDOSECRETS=ON
- -DWITH_XC_KEESHARE="$(usex keeshare)"
- -DWITH_XC_NETWORKING="$(usex network)"
- -DWITH_XC_SSHAGENT=ON
- -DWITH_XC_UPDATECHECK=OFF
- -DWITH_XC_YUBIKEY="$(usex yubikey)"
- )
- if [[ "${PV}" == *_beta* ]] ; then
- mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
- fi
- cmake_src_configure
-}
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 949cb61dc8aa..a6d25729d322 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != 9999 ]] ; then
else
#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
else
inherit git-r3
@@ -58,10 +58,6 @@ DEPEND="
BDEPEND="
ccache? ( dev-util/ccache )
"
-# Not a runtime dependency but still needed (see bug #667092)
-PDEPEND="
- x11-misc/xsel
-"
RESTRICT="!test? ( test )"
@@ -78,6 +74,7 @@ src_configure() {
-DWITH_GUI_TESTS=OFF
-DWITH_TESTS="$(usex test)"
-DWITH_XC_AUTOTYPE="$(usex autotype)"
+ -DWITH_XC_DOCS=OFF
-DWITH_XC_BROWSER="$(usex browser)"
-DWITH_XC_FDOSECRETS=ON
-DWITH_XC_KEESHARE="$(usex keeshare)"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 8f241d70628e..fc7e580ab987 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 940a23c230ac..3ca4f42c9654 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,16 +1,19 @@
AUX dpkg-1.18.12-dpkg_buildpackage-test.patch 215 BLAKE2B 9890d9f9bf0f2229f73d5639f1118fe32426485a6056c43cb4f443c3fa143a915c4a84ac6f484d2a1a1ad813344b9765d809b6e18cdc35191aca2151783e00a0 SHA512 c31aa285a9d896ea313ce7d04a959767811019781fb747714630d91b56c631557ea64716e6c0ff20f6f60da67ff8c143cc8697d7b482a2e387ca4712908d9154
AUX dpkg-1.18.12-flags.patch 416 BLAKE2B c7fe40b28793420afa0b895585cc14a675f9be68784beef7965fe6e971f6b2d6ecaa7c8bae51bb9f774c9517a618bff85b723052360224952cbdd2b74759b42e SHA512 6c86e8519ab4a05a2c15a658f41c0da14429c4fba0fcd364426afce7db03cd886a69de3f04f167d0f7b6d36a05252455864c11b14f58baab0a4536249331369c
AUX dpkg-1.18.12-rsyncable.patch 1245 BLAKE2B e1488cc6a6807d38ec7218ae6651b0d919fbc3ee5e2837540f91cf80229e669a6fe24d6de1c4bd1c1debdc34a0c04a2bbc6a21eb964032f24526986678eb1b14 SHA512 743f4780b4c93e53924836fae96d59c2f1098dae6ef683b2b30146ab0345109718a507486f86ff96cda5b705aff858da563cdc0d40c965bf964cafe7105994ae
+AUX dpkg-1.20.5-dpkg_buildpackage-test.patch 209 BLAKE2B d15000423abe8259e7bdd92e5ff2d38f8fd32622e8467259e791159df590f7d394647ba4efdd599b77d652f973cd07af09d64f29df920fb8015c995bce9b302a SHA512 046200d2a8c143a2b08e0c8113765c7a7a18846ce0b7a2dfd5a3f1167eacc70391415c6bcef21abe49e5d8225dbf08680fcdc405f0910e9c42071ad4cf8ae6d5
DIST dpkg_1.19.0.5.tar.xz 4557428 BLAKE2B 99c31705bfad1cfa024366c788264f4e747a7143f87c581730797975303c1054003e41fd65ecf80df1dc053ba87c0e8449ec574ddcb158228b41ae57a23db18f SHA512 60d7198ffe6ea759c30ad82143b3107d41ce59224b853cb5a7beb79af0de6ba6a69414c365e6b3555a0a9c60e3cf9b543a3a448d80a734be38ccecb77ae963a9
DIST dpkg_1.19.6.tar.xz 4802832 BLAKE2B e35a805942e2b26a90cec80493a14697461cfb1c1352fa7fadce7171c8cca88785ff2590d34b8f0bd4763642cb21ee7bf449df86b01eef223554daba4604d1b1 SHA512 71981079835ea4bd5c4a381ca8702cf489c788034e29c129899eb288cfaf4ec55eb58c0aea13145dcde99f15a47d2de71fba7b5e7eb8e6b1b1d6f016de8a919d
DIST dpkg_1.19.7.tar.xz 4716724 BLAKE2B d65200fc5da986db8b66e31e1ea45b9757b87e0fa15f7fc0579f1c1c63de78829c1a10bbc72726fe3b75bf6c11cbe1fe3c9b62f8374c796f990835f9f0e79dd2 SHA512 9ca441dc265baf5359c71617aef1c57504a7097c26ea57108b88dadc511bfa9918fcc765d8c67cec9def9916c5df92d6cabe508446dbc7223a29b45260445e81
DIST dpkg_1.20.0.tar.xz 4738556 BLAKE2B 2e58b3881abd46854416b05b0f9d2e972c3b545412a506b7bc18f1ebae5d82eac8bc2b55920d706fee0ca02239871c4f1c121e0c780aef31404e0408fbfa76e8 SHA512 5dd7961bde19ccc891fd5b77ca0085f7fc0308c20380e20b393397ff92e50d1c0f54e7b57676c05876021b44aa3788af8258c21ff2b672110ac92c7ce0b408f9
DIST dpkg_1.20.2.tar.xz 4710300 BLAKE2B 0d10ee7f5cc863a6496fd8340cf0457f9af3d7d7a74821d561d0cc500a056d52664d1418453fa45dcb27d01ef59e55eb299ce1fcccd1ae7cb72b7c9e43b6b120 SHA512 523713e40d4f49332d96fdcabaeaf4d97f56b40bbbd51f18d17b5c79598249d04fdf96dfc5c8684408a666cf04f622cbd30da60efe68ba2cf1cd836cb2503e02
DIST dpkg_1.20.3.tar.xz 4712980 BLAKE2B 92a1ff07dbb01f8942452eee269eb45d4c164272bf3ae5d0a62a6086c4321e7fc3dd5b164089d7f2e476258f8ec8c480c1614d4f43e3a7a7f1e632bf13191d2e SHA512 5893ae34efc6f9d54e47fc403487c79233501666968681b827bbabbf39b1401cb7064f8fe8797708ed32bb37345dbb78a1daac04c6dc7064f2811265f3a4e82c
+DIST dpkg_1.20.5.tar.xz 4715684 BLAKE2B 32b88cbd1ae75685b6c0b04b7c829372df323a9508ddd088076097e8bf2ac9050f1f4ec591fb7d40c4d4ea34207cef0edd430d0326cb73e1f7c8dd560db916be SHA512 6b3789c25c81022181b87a28ca9baa4a463a68940a871568c699a2a30e3b4ce705835ed6a171ac8c5902e377200b31cc0be1e03cbd7d35c4eaf92c7300d9227f
EBUILD dpkg-1.19.0.5.ebuild 1848 BLAKE2B d3a5aae22d24450b92205a2bdfda810a3c5b5047b8b7db37c09a66c0b18d8ca87b2c40b5111f3df5ec7a160edccea988e011a9c5954dc4d15be88a04111532ca SHA512 02c7e77565269ef09b1f0c6f96774079fc9c4003fffedf7c60ede89ae7afa9e16cbc433ef949415cf6896a8d77d43adc80b863840741ca33f883ad466003feb4
EBUILD dpkg-1.19.6.ebuild 1997 BLAKE2B fcf91e8fa0ba143a92c9508f90e4edc9e8a24544e9c1f5c9169d4c8ecece4c7c6c57848ea8b77398f6cecb3a7b4ef751083f0ce2de66dae5bf711e7375874205 SHA512 39ed5665ee5902488a6c8b6fb951b09ade9fe067fae4ee59ac8b1b27b443af22ba6d9f297a501923203fbe335f1a19cae21dd9c83da15f7031d9c5567bf44ba0
EBUILD dpkg-1.19.7.ebuild 1997 BLAKE2B fcf91e8fa0ba143a92c9508f90e4edc9e8a24544e9c1f5c9169d4c8ecece4c7c6c57848ea8b77398f6cecb3a7b4ef751083f0ce2de66dae5bf711e7375874205 SHA512 39ed5665ee5902488a6c8b6fb951b09ade9fe067fae4ee59ac8b1b27b443af22ba6d9f297a501923203fbe335f1a19cae21dd9c83da15f7031d9c5567bf44ba0
EBUILD dpkg-1.20.0.ebuild 1956 BLAKE2B c2bc7ce7f6caf26c282300b61f952310b9a864b6446a7e3098be3305399389b445bb1a552c9b8b41d2fff45f1da1488e9663b1e4f88ee47b8267d6e227f8c6b0 SHA512 0a3105efa877c86ecf7af70a7c49c71c59dae6184e275d811d3ff55b23ec4ccc342f20e9eb3b20ae1e1e1d8221678609fda731a2d96bd71afad3879d5795d058
EBUILD dpkg-1.20.2.ebuild 1928 BLAKE2B 52add907caa6060be19af86a1f2c02731e4bd2a6d6e826d9bc3b1d0b36f565b7450088ba727f5ddd747e6a0bfdd974b00525d352cfc81d38b1e9e1b083f70d3b SHA512 d7cacc1d8d6a970c527951c902ce6c10f3ceb73c09036f180f50bbd4669bd6b738c3e39d1445d8b311d72a9dc8effa879cb426fa71f1e598628a5781006bc1ca
EBUILD dpkg-1.20.3.ebuild 1928 BLAKE2B 52add907caa6060be19af86a1f2c02731e4bd2a6d6e826d9bc3b1d0b36f565b7450088ba727f5ddd747e6a0bfdd974b00525d352cfc81d38b1e9e1b083f70d3b SHA512 d7cacc1d8d6a970c527951c902ce6c10f3ceb73c09036f180f50bbd4669bd6b738c3e39d1445d8b311d72a9dc8effa879cb426fa71f1e598628a5781006bc1ca
+EBUILD dpkg-1.20.5.ebuild 2045 BLAKE2B 3032d7d98da16cbb0117060f68c6016d1ab2b82485ce324f48a1787c26c0e8c0a9d2fe759344f8a1b28420e9208595a1ede78684a3a03d0a9e2ada07cfd393a4 SHA512 88245644bf62c02486353fd4b8698d180c9f72c2f070c496932f7d2993d5b6c1b006796cb42dcef39e07fc81d782e7660aaff8599e8ac7bf3c923f595e850b84
MISC metadata.xml 433 BLAKE2B bfddf84314750bbaf97250dc51916485e8226379d3d3aa925f7879ca456c3052e062b1516592c49b4b048a0fe76a55c6302b719747ba43a7a8d6fbd65c9eb8ec SHA512 da157c95d0dcf2086b37482bad4bd1c52da16c015e71411653f12e3f5e0f25d710e1819675a0d5b8e92a9e185dc61f602007e3a8875aa1b05b78f128de1b0ca1
diff --git a/app-arch/dpkg/dpkg-1.20.5.ebuild b/app-arch/dpkg/dpkg-1.20.5.ebuild
new file mode 100644
index 000000000000..af21bc2149b8
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.20.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib autotools toolchain-funcs
+
+DESCRIPTION="Package maintenance system for Debian"
+HOMEPAGE="https://packages.qa.debian.org/dpkg"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/perl-5.14.2:=
+ bzip2? ( app-arch/bzip2 )
+ libmd? ( app-crypt/libmd )
+ lzma? ( app-arch/xz-utils )
+ nls? ( virtual/libintl )
+ selinux? ( sys-libs/libselinux )
+ zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+DEPEND="
+ ${RDEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig
+ test? (
+ dev-perl/IO-String
+ dev-perl/Test-Pod
+ virtual/perl-Test-Harness
+ )
+"
+BDEPEND="
+ sys-devel/flex
+ nls? (
+ app-text/po4a
+ >=sys-devel/gettext-0.18.2
+ )
+"
+DOCS=(
+ ChangeLog
+ THANKS
+ TODO
+)
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.18.12-flags.patch
+ "${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
+ "${FILESDIR}"/${PN}-1.20.5-dpkg_buildpackage-test.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i -e 's|\|${AR}|g' t-func/deb-format.at t-func/testsuite || die
+
+ eautoreconf
+}
+
+src_configure() {
+ tc-export AR CC
+
+ econf \
+ $(use_enable nls) \
+ $(use_enable unicode) \
+ $(use_enable update-alternatives) \
+ $(use_with bzip2 libbz2) \
+ $(use_with libmd) \
+ $(use_with lzma liblzma) \
+ $(use_with selinux libselinux) \
+ $(use_with zlib libz) \
+ --disable-compiler-warnings \
+ --disable-dselect \
+ --disable-start-stop-daemon \
+ --localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+ emake AR=$(tc-getAR)
+}
+
+src_install() {
+ default
+
+ keepdir \
+ /usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
+ /var/lib/dpkg/{alternatives,info,parts,updates}
+
+ find "${ED}" -name '*.la' -delete || die
+
+ if ! use static-libs; then
+ find "${ED}" -name '*.a' -delete || die
+ fi
+}
diff --git a/app-arch/dpkg/files/dpkg-1.20.5-dpkg_buildpackage-test.patch b/app-arch/dpkg/files/dpkg-1.20.5-dpkg_buildpackage-test.patch
new file mode 100644
index 000000000000..9f1494dc290c
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.20.5-dpkg_buildpackage-test.patch
@@ -0,0 +1,10 @@
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -264,7 +264,6 @@
+ t/Dpkg_Dist_Files.t \
+ t/dpkg_realpath.t \
+ t/dpkg_source.t \
+- t/dpkg_buildpackage.t \
+ t/merge_changelogs.t \
+ t/mk.t \
+ $(nil)
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index ade1b1fe4946..05244f310b38 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 7a3568fb3723..470dec76d1d8 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,4 +1,6 @@
DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
+DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
EBUILD acme-1.5.0.ebuild 1735 BLAKE2B 6672a6522b20e85a4d8e2181674bf87dde72ebeb762db91415efb051077b191c7193ba1eb55a8ea387ae09dbdf57b766423cc62909fde4a673f14d545551f5b4 SHA512 2c555871d0ed02df90b9149282dab1a0aacd5d662a9dc9d25b5887d56a3c2cc9200503197edb7b736a960fa374918813e33a826eec28f7565d883fabb613a2e7
-EBUILD acme-9999.ebuild 1737 BLAKE2B 06af2a535bda2baf9baa807647ede63d0189d66e0bedf02e5ec1fe4d33f4b804a4c620163bee5247ae9558d886f918bea761aeb361636a18138c4f91dee9cb54 SHA512 a8f6f502cc67c3bf355e064718293d31fbb993563a12cf87c2dafe41f724e60e6e93a4bdc3ac048a4fc7c2b5fe7be169510b0a779937e26347052ab83fee92eb
+EBUILD acme-1.6.0.ebuild 1737 BLAKE2B 0ff95a7344d44408e8075d0aa006a33ca276db92499ed404e549b960a23da8a63a0f6604251b0066666976e07eb809bd2cab05ee9fda3a64b1b423e1993c599a SHA512 1f850adad3937d447e9c03523ffcc8ec01551d1d35eabf26215c4ed0eaa81ca4285a0a2191b05655274a4132bef18be1b791ebd7f911f4481e33f621929cdca8
+EBUILD acme-9999.ebuild 1737 BLAKE2B 0ff95a7344d44408e8075d0aa006a33ca276db92499ed404e549b960a23da8a63a0f6604251b0066666976e07eb809bd2cab05ee9fda3a64b1b423e1993c599a SHA512 1f850adad3937d447e9c03523ffcc8ec01551d1d35eabf26215c4ed0eaa81ca4285a0a2191b05655274a4132bef18be1b791ebd7f911f4481e33f621929cdca8
MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-1.6.0.ebuild b/app-crypt/acme/acme-1.6.0.ebuild
new file mode 100644
index 000000000000..a3d394a31a62
--- /dev/null
+++ b/app-crypt/acme/acme-1.6.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+ >=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.10[${PYTHON_USEDEP}]
+ >=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+ >=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+src_compile() {
+ python_foreach_impl run_in_build_dir default
+ distutils-r1_src_compile
+ if use doc ; then
+ cd docs || die
+ sphinx-build -b html -d _build/doctrees . _build/html
+ fi
+}
+
+python_test() {
+ nosetests -w ${PN} || die
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 1d83c8b8d408..a3d394a31a62 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
dev-python/pyrfc3339[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
>=dev-python/requests-2.10[${PYTHON_USEDEP}]
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 036a434c7770..f82e7bd9f065 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -2,7 +2,9 @@ AUX 92_pcscd_ccid-2.rules 2275 BLAKE2B a72b8d2bb8cf56f621a0762dac95500f93afa2242
DIST ccid-1.4.30.tar.bz2 642342 BLAKE2B fd43aa2a4c8840abb0545760f6ceb31bb9d7dc22d7283888c9a142e0c3b34310ec4530d18986451b21c6b1a3975b1212ab653a4c8d58466b28713f0f72ce1cdb SHA512 1761a4053a99eb28184d0ffece951aec5d4b646080597b4ae36b18a31fb7a76c55fabfa57ee8e5d7f2db1a6e13d209f7fa995fe6ed067f44558bea34a26d46da
DIST ccid-1.4.31.tar.bz2 644039 BLAKE2B bd8e9c69e122348ffbeddc4f85f939d7d4c93dbfe5f712bc16f671af144570ce2c3bc6da04503851f4ce0f95f0c89bbbe6bbf0852be97cf5574993875d865870 SHA512 51d102c6be5b234ed568522d51b97bdb27c4c22d9610874abd7a18314f4e8ebe81fcb18a16a1edbdc814ee652a037d50202673a50de2fdeb0eac74063b149ed3
DIST ccid-1.4.32.tar.bz2 657200 BLAKE2B 9598b010f2eb085d1d02d9363136b294dc30ea1cf9256d398838461016fae5572926d5f24e3065384c9a349b0a9783670c8cb9d4f59bf50171c7f5501b963d82 SHA512 80fc3bac547ee7c37ff0e72cc650d0a5e1102720698bdc1278581ec53ff1407e0e719eb0345775fbc76c0d56d9271dcb07a9ddc98450bba2ff37823f23a8adbf
+DIST ccid-1.4.33.tar.bz2 659673 BLAKE2B f8dd37ed4fd2bd15e6313417dc01feecd0303502d24eeae101ad13233510b5e26b08439c4de453abc734695618faa1c8031e545d045527aa841ab9056a3d729e SHA512 ccfcecbaca4c8f1ee4a4925bd313ced6d6f15ad422cbcc387627aef203a9ae0ff7775c4a2c5d25978ab33ebfd93c34de50e1f783df787b77ea7c774a45ed126b
EBUILD ccid-1.4.30.ebuild 1537 BLAKE2B 40302bc90b107dc00e626678b0b575d5a8f3b6a6844d4058826a0d7875429ac32eda12785f77275fece433eabb265d001490a0745841bdf0568666e24359f073 SHA512 559a21ea87990de3d17158ccc24fd666929826c8de604f19dca8e41921d2f3d5ebcefb90e02c4c1acda08dd4cdbca3e3aabdd43ee447a87f6dc15ec470c84f31
EBUILD ccid-1.4.31.ebuild 1545 BLAKE2B 5627cd4bdb7e5d743fe0f4a176ee60dfbeb6f59d702aff09ea3537859f134696d84750ef926d2451fcc6e8e3980fa18c0a21b0fae58cc45ca511006bf0da7f1a SHA512 08c9b5ca0996e28865c109da5d289b45f2dd55e5773a6b96dd59d68e66152466ac87b35a3f5cd032b68c7ff75d8d22ac27910644c3923c27911d31820ffbbaa9
EBUILD ccid-1.4.32.ebuild 1545 BLAKE2B 5627cd4bdb7e5d743fe0f4a176ee60dfbeb6f59d702aff09ea3537859f134696d84750ef926d2451fcc6e8e3980fa18c0a21b0fae58cc45ca511006bf0da7f1a SHA512 08c9b5ca0996e28865c109da5d289b45f2dd55e5773a6b96dd59d68e66152466ac87b35a3f5cd032b68c7ff75d8d22ac27910644c3923c27911d31820ffbbaa9
+EBUILD ccid-1.4.33.ebuild 1545 BLAKE2B 5627cd4bdb7e5d743fe0f4a176ee60dfbeb6f59d702aff09ea3537859f134696d84750ef926d2451fcc6e8e3980fa18c0a21b0fae58cc45ca511006bf0da7f1a SHA512 08c9b5ca0996e28865c109da5d289b45f2dd55e5773a6b96dd59d68e66152466ac87b35a3f5cd032b68c7ff75d8d22ac27910644c3923c27911d31820ffbbaa9
MISC metadata.xml 404 BLAKE2B e9f39e817f575a3412bcf79c42aa58c22547d4abe41272151ea3147cf08d2ba413b2840281115ff1f84bbb90ab8f5e5731d7b2daa2c0887dc3b07466680e0dcc SHA512 5710a9f296257aa374fdabf1745b11e351eb1f92cf635918d73a5293afcba490d3eea9785587e4212922d94aa2e079496ced99853f0ff2ad891e41c6e1c816f8
diff --git a/app-crypt/ccid/ccid-1.4.33.ebuild b/app-crypt/ccid/ccid-1.4.33.ebuild
new file mode 100644
index 000000000000..a47b8bea185c
--- /dev/null
+++ b/app-crypt/ccid/ccid-1.4.33.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
+SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="twinserial kobil-midentity +usb"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.8.3
+ usb? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="kernel_linux? ( virtual/pkgconfig )"
+
+DOCS=( README.md AUTHORS )
+
+src_configure() {
+ econf \
+ LEX=: \
+ $(use_enable twinserial) \
+ $(use_enable usb libusb)
+}
+
+src_compile() {
+ default
+ use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
+}
+
+src_install() {
+ default
+
+ if use kobil-midentity; then
+ dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
+ doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
+ fi
+
+ if use kernel_linux; then
+ # note: for eudev support, rules probably will always need to be
+ # installed to /usr
+
+ # ccid >=1.4.11 version changed the rules drastically in a minor
+ # release to no longer use the pcscd group. Using the old ones in
+ # the mean time.
+ udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
+
+ # disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
+ if ! use kobil-midentity; then
+ sed \
+ -e '/Kobil_mIDentity_switch/s/^/#/' \
+ -i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
+ fi
+
+ fi
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index cddf25146235..1458b201eaa3 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,4 +1,6 @@
DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
+DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
EBUILD certbot-apache-1.5.0.ebuild 1068 BLAKE2B b3f72cb67e8eb10bbfab2f4badd1a15853526f1605cf4559191a67837d49118ab4bcaaf730bbfc164679f0732835bd274e1a8fdc56cf8fd8f3bd1bf46471e019 SHA512 a3d28f9dd5ae0a3e2eabf156636aeb835a2c5957bd5868f84cf1adc0d8b69c3c084981d756e6460d1d7a8fe157625a1c9785da5cd2a28a7b4455f83bc4fbd9e1
-EBUILD certbot-apache-9999.ebuild 1070 BLAKE2B d6b3ef4ff80e04cb94d44726c2a63aaf78171e9ab990f137f69ecb521ed70708c6a840071d32e62a590c43021bdcb48d1d2027c1a3bb64cc1030be5ef78f1224 SHA512 3c4cf9cf312c78e845b1bcb710f0bbb20a2ce135c140ff32cd707b995b95a1c655ea6d5b064319d65268f88061a614e849f09c8d2b544f3084da97d688702d49
+EBUILD certbot-apache-1.6.0.ebuild 1070 BLAKE2B 7682b9837e69148d7ec9064322919f073a9965f8e04558ec578d63fa18ead49d87f5c454573dd64cfb2d720e97a4999a120985c64ac107219b092563d35744a3 SHA512 eb2df5510b51767aa37b77166ff9dbf7b6189d3464a4db1598a65d0766e7b21548bd9012bfb07e87f6413e8d67e29003b6a3e1df2426c282c509787466c58cc9
+EBUILD certbot-apache-9999.ebuild 1070 BLAKE2B 7682b9837e69148d7ec9064322919f073a9965f8e04558ec578d63fa18ead49d87f5c454573dd64cfb2d720e97a4999a120985c64ac107219b092563d35744a3 SHA512 eb2df5510b51767aa37b77166ff9dbf7b6189d3464a4db1598a65d0766e7b21548bd9012bfb07e87f6413e8d67e29003b6a3e1df2426c282c509787466c58cc9
MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-1.6.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.6.0.ebuild
new file mode 100644
index 000000000000..76ac8396ce17
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-1.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7})
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+ >=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+ dev-python/python-augeas[${PYTHON_USEDEP}]
+ dev-python/zope-component[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+ dev-python/pytest[${PYTHON_USEDEP}] )
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ esetup.py test || die
+}
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index 6a66d1858399..76ac8396ce17 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -25,7 +25,7 @@ IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
- >=app-crypt/certbot-1.1.0[${PYTHON_USEDEP}]
+ >=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
dev-python/python-augeas[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index d91ccc3a11de..81992907e4fc 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,4 +1,6 @@
DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
+DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
EBUILD certbot-nginx-1.5.0.ebuild 967 BLAKE2B fc0874272d53d3c621d7d275096a60e3c783d68ff72dc806e19446210d9af93ef7e542fb7ee149232f95158a687a8fa29ae83176069ba22e0ad6573ab08611bf SHA512 894529f71f1515aa7971bb7487595b9276be582eb08b12af3ae2cfa8736282db68301befcd7d1d18dda00369f11e09f9b00928929ae1d2154c5e97ba37a3d4a1
-EBUILD certbot-nginx-9999.ebuild 969 BLAKE2B d6b7572af8756020330110055c1e3e4c28b54bb4f3adaedd71b565425b3d7d0950ca233f9a7c0040c7f6f8887c99227e661bebf2d97d054c687b28212e955703 SHA512 8ec6ed2c69c2f16ede2112f43d9b157b3b981e5c2177d21a4bf6a750f22cdec798e62eededf3ae0e0b6859f25e408531b3782ee2271a18188be48b49cdba8b6f
+EBUILD certbot-nginx-1.6.0.ebuild 969 BLAKE2B fbe24cecaecdd36d79f18a492a9bdc4cef38c279101a1603360b766a02324b7bfc01f42317246f9afb9aae10270b20eb117f0762d3534d0cbf0a41faab4847c3 SHA512 d08a6d74a44091da81d8b70d65c24b43377a98eb23f3a7f0947bdd19b2638e81ae926e4192918badf934c76fb7e8b46abd3160d063c7ea4192c36faba45160db
+EBUILD certbot-nginx-9999.ebuild 969 BLAKE2B fbe24cecaecdd36d79f18a492a9bdc4cef38c279101a1603360b766a02324b7bfc01f42317246f9afb9aae10270b20eb117f0762d3534d0cbf0a41faab4847c3 SHA512 d08a6d74a44091da81d8b70d65c24b43377a98eb23f3a7f0947bdd19b2638e81ae926e4192918badf934c76fb7e8b46abd3160d063c7ea4192c36faba45160db
MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.6.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.6.0.ebuild
new file mode 100644
index 000000000000..cf2c81af951b
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7})
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+ >=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
+ >=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index b6f70f8607be..cf2c81af951b 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -26,7 +26,7 @@ IUSE=""
CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${CDEPEND}
>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
- >=app-crypt/certbot-1.4.0[${PYTHON_USEDEP}]
+ >=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index d33e73615907..33a9d5dc09f8 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,4 +1,6 @@
DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
+DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
EBUILD certbot-1.5.0.ebuild 1446 BLAKE2B 9daef0f298f1d00450d3c9d87f6f4c731633b224c920feb0902f7d1fd7fab3c4f58385a2c917c9aa556e34769f90597be056003ed03a8cb718b2d48a7788a441 SHA512 e6cca25c2a6e2ac172fa3e936618ab36d9b71ed5b3fb838c73bae456b9979e286afae53f7d7f98317326d691bf66a03744ea0b7b01f236401d2b334c6be6da7f
-EBUILD certbot-9999.ebuild 1448 BLAKE2B 6d50286cc52e3c627a218c33f480519e1d7bb5c5969211455e00098005b59f92f4a1ecb5ce77675956375e903c89fd93f8a0540f41b67cb1270fca47b8fae819 SHA512 039f07c2098359ce63952c7cfcc7ec4db0175e7b898aa28a97ecf1237d75602f39534ce59153ccc200654b638a8c26c9d4f043683a334d9ee2214a84c26a70f6
+EBUILD certbot-1.6.0.ebuild 1448 BLAKE2B 800c168ba8c51cddb5ba84372c4161673c1b276ce8ecd113550d2c24b008d368161e52b6771fe1d511c83ae65b18b7d92cd09d2eb0384e0aee1dbd5ae8ea91e5 SHA512 c435e77b29bf1cf8ad3c9637954544d9e433beefee63a3ebe5c5709e8d781d0fa33be3105d0617e583a7d3ac28334b1c605fa69a9f362e1e2940098a18760885
+EBUILD certbot-9999.ebuild 1448 BLAKE2B 800c168ba8c51cddb5ba84372c4161673c1b276ce8ecd113550d2c24b008d368161e52b6771fe1d511c83ae65b18b7d92cd09d2eb0384e0aee1dbd5ae8ea91e5 SHA512 c435e77b29bf1cf8ad3c9637954544d9e433beefee63a3ebe5c5709e8d781d0fa33be3105d0617e583a7d3ac28334b1c605fa69a9f362e1e2940098a18760885
MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-1.6.0.ebuild b/app-crypt/certbot/certbot-1.6.0.ebuild
new file mode 100644
index 000000000000..f5147fca7936
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.6.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+S=${WORKDIR}/${P}/${PN}
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+ ${CDEPEND}
+ >=app-crypt/acme-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+ dev-python/configobj[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/zope-component[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # required as deps of deps can trigger this too...
+ echo ' ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini
+ distutils-r1_python_prepare_all
+}
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index fb33b72fd174..f5147fca7936 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="
${CDEPEND}
- >=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
+ >=app-crypt/acme-1.6.0[${PYTHON_USEDEP}]
>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]
>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index d85fed037d21..37dd088fc248 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/csound-manual/Manifest b/app-doc/csound-manual/Manifest
index 44f4f2fd98a5..3c26e90360b5 100644
--- a/app-doc/csound-manual/Manifest
+++ b/app-doc/csound-manual/Manifest
@@ -1,16 +1,6 @@
-DIST Csound6.06_manual-fr_html.zip 11037078 BLAKE2B f496488905ab1c42d1612931f9b69818b6338ca3630052b77305755bc5333699f652d946403b33a68f9f3ab8cc4a29eafb225ee795ab793385252c58f5630cea SHA512 0c643639534444440dd8211e27b0a3b78fc5ef2c1c67903e9085307d9dabaa121c78b7d90b7143afba20738f73041d46305a72242a30462ccd58c5d0583f490a
-DIST Csound6.06_manual-fr_pdf.zip 6507610 BLAKE2B 14a51d01dc56bd029360021035bfe674fb959b7a93fc02f7cded5f0305c91b4e1503f36b4755b36cd5a30aff6018d41b8bda0da93a1db7fa2a688909651378bd SHA512 7269600729c491e9b4869146da35df05f6551962caac2b87114890abbfe49910ff3f0c4bdd6f359ae020111da6f75cd2ec99ed8b05f50dd5f4282dbb6d5f48b0
-DIST Csound6.06_manual_html.zip 10792740 BLAKE2B 80118899522df96b7453dcbf1c99f68134c3c9141d53f4215926676f69c573484f504098225fceaa75b231c6df60ee9760f8e4e6555ded6388ece50203f7b534 SHA512 b98e3698610ef3080417ba838c272df476a7ea56ec9f444c90e71b4113dc1ff88e4c108f32046fff0d3a19bdea0bc19bc97f96728f47055dc1e5de088cd06345
-DIST Csound6.06_manual_pdf.zip 6181517 BLAKE2B 78ba98fef22846da0b8ae5cd17f64672385cd82c177063c31b8b483c12ab95f368ca4cb2611045f207609c4fa2048b79e4af383dcb39958fc7e955d2a73c5a5d SHA512 a96a002f298a3ffb852639ff0cb128f58129c7684a6f03d13f3008bc10992188a7adbbb2f9fdb423d2c11ae6e96bf5b04cae07ff78713f0e81d969665182182c
-DIST Csound6.07_manual-fr_html.zip 15495149 BLAKE2B cb32ff5e8a4824a630609f32c8073f46166cdfe85ef40e48e21689da63ccf8e7536de4c5969323a19c645a30785df17e74be259b414d7ef58e435bfd4cde6e13 SHA512 fe676842efb6f47036a75231b1a722eac77c30d1f3810aed81f0e36427fa9aebf57e830f70260ae7a6dbee86447e75a02ac5f51349ece322e140f9ab8dbf334c
-DIST Csound6.07_manual-fr_pdf.zip 6602805 BLAKE2B dc5fb0b906b080f6e9eead16d92d435b94b89242e87da92d9b1d560fffa385febd556f3a8f88260f52922fed0785c80ab59ce826209f2dbfd86e1743532e8b19 SHA512 a39bc2d1c89d304471ac9675809842ce12d43b65af1ab2db643b822a1f9aeb7a69ab6dd93986eb3f582bc76200b68a4f87eeb2ef9a5775d575099c662f5d4c0a
-DIST Csound6.07_manual_html.zip 15220371 BLAKE2B 2fb12bbbc1fd96bf51c4f4a161f9a9a8ead9d6f34a234bdf35339413568e5fba2309daa9265c0a088e338ee24e9e3fbf2788c414cd516e19547843e24d2633be SHA512 dcf288d7c968bbeeb7fed449b6d423331f29eb7fe4d0afb8786d0cdb60449d6d2a416551e567be4ac28baf4432e5326225e533eb6c232fa93ff4ec6dca3d5557
-DIST Csound6.07_manual_pdf.zip 6272890 BLAKE2B d5e7630f6f4c25173c1f7acf75827deb97b13a41611aa2404f5f276ac63db15d390a09e736db6e10cf51f61f01242d927c0d4a8535712bf9ef29a72ccf57d668 SHA512 e1affd039cd246a6eedbff4d8af68fe2e49d89ce60d839774b30a61059a4463bf3c30812e5edb05f3df5cb2cf33ac9c678338ecd110d57334aa3ce240168a466
-DIST Csound6.08_manual-fr_html.zip 15576083 BLAKE2B 9f0a3909c8a19e064fc8f2c0df1c9df473952b26bf0ca03dd008bad52478c0cc2bd4f669d0f86a82f3984478f49161e921932e3d926f1462ee712aaf1be7cdd9 SHA512 7e3a5fbf2c52a1f5f0e9a6c5ee2bfe5e155edfdab81c9a64b66756754dba07a4bc6e7279e668c54ab762c1055a66f2a28c4928d5d3cd7af5418d049b8ffacdd3
-DIST Csound6.08_manual-fr_pdf.zip 6660383 BLAKE2B df49475156a5f85e67e6ec9179414d4f410effe64dfbe3d21c0f5ae445b62e62370e7d316b1ef5a83eeee7811ff24a34827675ae007f83a18dcd008dc35e7537 SHA512 eb61a576bf0eb4620c12c123ae2e23589cc24f53bffc05e646efba633ebb142906f021b41ac9a77b030476c319cc3ffa3466927ffe9f266d67f7e72217f97396
-DIST Csound6.08_manual_html.zip 15267494 BLAKE2B 107c04428c3df256388ce15aabec27084a9f0768afc61159be4abdc16c39cb34aa1d38106706d9a6496efbe72633945a08c071b0f4a6a78f61e0b8f8bedceb48 SHA512 7aaf61d94c067907a418df4bdf48a86b1bb2c220a6f2cedcef7b50af3e49040cd2c0f6f389b9d82b22f4fe6b166fdf4608d70be7e83f2caf7889ce61610dd8e6
-DIST Csound6.08_manual_pdf.zip 6326314 BLAKE2B 971492b74ae37cb6a2b9ff6105ecd5b889cefc03f3284d6101b455ce02b45b5dd2a053cdf4c4e08d2178c5ee879d5d4545746c43899f955a19efb4587c1ab659 SHA512 b911af38ea78b8b551abf1599f0078911c1a80ea44580119ad5c32afb95f07d59848643afcde20c6c64b61af868b1242aa04174761b983a0c160cea2bc28f243
-EBUILD csound-manual-6.06.ebuild 1164 BLAKE2B 104440ba66dc2be8a4c164e8f7a281e858dfe4991e36d951636926fda09f1c8b5d79a86417bed621469c73564a80ac04870ea84e2aed4189f56764650a4d33d5 SHA512 a7af8525a7dc2259d3368b5453cfc68a4eacb463c829f516503d034a773f1412425cbf74e559800f4e3429f9aa664de22f4747a901345221b017991bce1b786c
-EBUILD csound-manual-6.07.ebuild 1301 BLAKE2B 0397b04c0bd54ff8e569b6a6251d5aff815d7caba695c2a60dc9aef3dc8bff00959a615ad96b170a655137b56e850db62fb4937ae272d562b2b60612fde9b834 SHA512 0a3c467b7de80cd0b49eab1ed4064347ca77d4c2c6f8a1d500bc4e36ca13b01b47ddd2f6c20466c90bf0cb05d2ebf5ce421ca8c18a07e69926d5bb7a26e63eea
-EBUILD csound-manual-6.08.ebuild 1301 BLAKE2B 0397b04c0bd54ff8e569b6a6251d5aff815d7caba695c2a60dc9aef3dc8bff00959a615ad96b170a655137b56e850db62fb4937ae272d562b2b60612fde9b834 SHA512 0a3c467b7de80cd0b49eab1ed4064347ca77d4c2c6f8a1d500bc4e36ca13b01b47ddd2f6c20466c90bf0cb05d2ebf5ce421ca8c18a07e69926d5bb7a26e63eea
+DIST Csound6.14.0_manual-fr_html.zip 17370248 BLAKE2B a937df6ac27ba7c7b65caf826cb27111169b1bb4fb8fdedc1eaa56f08e6751b2e4b47237333e624c3104a3022a300fbd4d25c7ecf77286f43138aec14beeb191 SHA512 a92d74003ebedd8f7b208053d5eeaa2a88e84bdb3d7bd3aeb3ff20bbe31700ad29a89901d574a28284acf4cdba46abe620a65b228e68cf078b96f251bb1ea739
+DIST Csound6.14.0_manual-fr_pdf.zip 9272138 BLAKE2B a553f553ce173e3f3788b57478569bdec9638493e8f9098631c2f9615e71315b6ef4ef72c91d24e2b284666a10b38ba39cf440309c917bd78161b9ec5fa9cb83 SHA512 ebadac56000056d0de0cfbb16eca6a06009800fdcdc5b4e07ebec41561745faa451ddd250610e5253bb5437e1190f184572c1dc9365a096676c6a7f4923cd266
+DIST Csound6.14.0_manual_html.zip 17081006 BLAKE2B 9565c21623a60e06aae82bfbde186e496b5f3ae0eb619289a7db08235c7dcd520bee2283552fdf2ddb4eb85c7b0f184397d2fa0ee14d3bdeff9dccb44a7d7ff1 SHA512 638ecd8bc0b4c981e1f8c5592a123a3b1bb5582ee7017288be224eb670fccda79242ae42b6f6d8e91c2ad2f708af1de3c66283030d4b3373c0ec29ec260f379b
+DIST Csound6.14.0_manual_pdf.zip 8881242 BLAKE2B a91a3689dd3efa5c32c924178b646b73787132a07575f05a65ee1acafc69108ce6c33512e0b703012f75f201a86a0b84e08976f158b01ef5201807d1aaa31c35 SHA512 55769acd58add0ec6df5e188c74e16424deb679aebdbdd50dc5d9006c80a26c31dfe2564e5d71478abcb7a920b40c1f1baa02e4c3fd682a6d3bbc378ddcb8b7d
+EBUILD csound-manual-6.14.ebuild 1300 BLAKE2B 5de21e2e1f0db545f4e50fb5c10a9a9944ac24200d6dc4c02e97c0a879ed49cb18f146d3d1311319f96e1227b8cd1b6ec8c335a27bb1b92d29cd2f12dd5ed169 SHA512 1cdb3606908f0ec5dbf5bcf62dc2f6637644050a430823b13d343e5de7ff365f9d2b6e8307cc181cc099ca3343583848e9bbec1fb12fe9c79dca0129b6298f0c
MISC metadata.xml 457 BLAKE2B 9cd43383f76b6c6343bd35e014b4d47d7ce84993c06423a4ece92c0dadd34c55b2ca8cc1487c6f809eb6294cf2ae45a8b66f4a41cc32f81a3aee24457f2d4ccf SHA512 3c5fae5f35af69eeb1b3da8aa3bc6995dc4af3c582843e9b86691a68e0e084382a64a47651596f8f04714c41f7004ea1c0fef1765d334ae0dbbb1569d74daae4
diff --git a/app-doc/csound-manual/csound-manual-6.06.ebuild b/app-doc/csound-manual/csound-manual-6.06.ebuild
deleted file mode 100644
index 206f7fd6511d..000000000000
--- a/app-doc/csound-manual/csound-manual-6.06.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=Csound${PV}
-
-DESCRIPTION="The Csound reference manual"
-HOMEPAGE="http://csounds.com/"
-SRC_URI="
- mirror://sourceforge/csound/${MY_P}_manual_pdf.zip
- l10n_fr? ( mirror://sourceforge/csound/${MY_P}_manual-fr_pdf.zip )
-
- html? (
- mirror://sourceforge/csound/${MY_P}_manual_html.zip
- l10n_fr? ( mirror://sourceforge/csound/${MY_P}_manual-fr_html.zip )
- )"
-
-LICENSE="FDL-1.2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html"
-
-LANGS=" fr"
-IUSE+="${LANGS// / l10n_}"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack ${MY_P}_manual_pdf.zip
-
- if use html ; then
- unpack ${MY_P}_manual_html.zip
- mv html html-en
- fi
-
- local lang
- for lang in ${LANGS} ; do
- use l10n_${lang} || continue
- unpack ${MY_P}_manual-${lang}_pdf.zip
- if use html ; then
- unpack ${MY_P}_manual-${lang}_html.zip
- mv html html-${lang}
- fi
- done
-}
-
-src_install() {
- dodoc *.pdf
-
- if use html ; then
- dohtml -r html-en/*
-
- local lang
- for lang in ${LANGS} ; do
- use l10n_${lang} || continue
- docinto html-${lang}
- dohtml -r html-${lang}/*
- done
- fi
-}
diff --git a/app-doc/csound-manual/csound-manual-6.07.ebuild b/app-doc/csound-manual/csound-manual-6.07.ebuild
deleted file mode 100644
index 12bf909a84ab..000000000000
--- a/app-doc/csound-manual/csound-manual-6.07.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=Csound${PV}
-
-DESCRIPTION="The Csound reference manual"
-HOMEPAGE="http://csounds.com/"
-SRC_URI="
- https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual_pdf.zip
- l10n_fr? ( https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual-fr_pdf.zip )
-
- html? (
- https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual_html.zip
- l10n_fr? ( https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual-fr_html.zip )
- )"
-
-LICENSE="FDL-1.2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html"
-
-LANGS=" fr"
-IUSE+="${LANGS// / l10n_}"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack ${MY_P}_manual_pdf.zip
-
- if use html ; then
- unpack ${MY_P}_manual_html.zip
- mv html html-en
- fi
-
- local lang
- for lang in ${LANGS} ; do
- use l10n_${lang} || continue
- unpack ${MY_P}_manual-${lang}_pdf.zip
- if use html ; then
- unpack ${MY_P}_manual-${lang}_html.zip
- mv html html-${lang}
- fi
- done
-}
-
-src_install() {
- dodoc *.pdf
-
- if use html ; then
- docinto html
- dodoc -r html-en/*
-
- local lang
- for lang in ${LANGS} ; do
- use l10n_${lang} || continue
- docinto html-${lang}
- dodoc -r html-${lang}/*
- done
- fi
-}
diff --git a/app-doc/csound-manual/csound-manual-6.08.ebuild b/app-doc/csound-manual/csound-manual-6.08.ebuild
deleted file mode 100644
index 12bf909a84ab..000000000000
--- a/app-doc/csound-manual/csound-manual-6.08.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=Csound${PV}
-
-DESCRIPTION="The Csound reference manual"
-HOMEPAGE="http://csounds.com/"
-SRC_URI="
- https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual_pdf.zip
- l10n_fr? ( https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual-fr_pdf.zip )
-
- html? (
- https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual_html.zip
- l10n_fr? ( https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual-fr_html.zip )
- )"
-
-LICENSE="FDL-1.2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html"
-
-LANGS=" fr"
-IUSE+="${LANGS// / l10n_}"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack ${MY_P}_manual_pdf.zip
-
- if use html ; then
- unpack ${MY_P}_manual_html.zip
- mv html html-en
- fi
-
- local lang
- for lang in ${LANGS} ; do
- use l10n_${lang} || continue
- unpack ${MY_P}_manual-${lang}_pdf.zip
- if use html ; then
- unpack ${MY_P}_manual-${lang}_html.zip
- mv html html-${lang}
- fi
- done
-}
-
-src_install() {
- dodoc *.pdf
-
- if use html ; then
- docinto html
- dodoc -r html-en/*
-
- local lang
- for lang in ${LANGS} ; do
- use l10n_${lang} || continue
- docinto html-${lang}
- dodoc -r html-${lang}/*
- done
- fi
-}
diff --git a/app-doc/csound-manual/csound-manual-6.14.ebuild b/app-doc/csound-manual/csound-manual-6.14.ebuild
new file mode 100644
index 000000000000..aed36a01f91d
--- /dev/null
+++ b/app-doc/csound-manual/csound-manual-6.14.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=Csound${PV}.0
+
+DESCRIPTION="The Csound reference manual"
+HOMEPAGE="http://csounds.com/"
+SRC_URI="
+ https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual_pdf.zip
+ l10n_fr? ( https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual-fr_pdf.zip )
+
+ html? (
+ https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual_html.zip
+ l10n_fr? ( https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual-fr_html.zip )
+ )"
+
+LICENSE="FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="html"
+
+LANGS=" fr"
+IUSE+="${LANGS// / l10n_}"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
+
+src_unpack() {
+ unpack ${MY_P}_manual_pdf.zip
+
+ if use html ; then
+ unpack ${MY_P}_manual_html.zip
+ mv html html-en
+ fi
+
+ local lang
+ for lang in ${LANGS} ; do
+ use l10n_${lang} || continue
+ unpack ${MY_P}_manual-${lang}_pdf.zip
+ if use html ; then
+ unpack ${MY_P}_manual-${lang}_html.zip
+ mv html html-${lang}
+ fi
+ done
+}
+
+src_install() {
+ dodoc *.pdf
+
+ if use html ; then
+ docinto html
+ dodoc -r html-en/*
+
+ local lang
+ for lang in ${LANGS} ; do
+ use l10n_${lang} || continue
+ docinto html-${lang}
+ dodoc -r html-${lang}/*
+ done
+ fi
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 05aa56913560..d2bd90bc0a35 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/notepadqq/Manifest b/app-editors/notepadqq/Manifest
index fa67bdfaadfe..7d898884d5db 100644
--- a/app-editors/notepadqq/Manifest
+++ b/app-editors/notepadqq/Manifest
@@ -1,4 +1,4 @@
DIST notepadqq-2.0.0_beta.tar.gz 4516680 BLAKE2B 9a16ab64134ab0d33a68cc528db6a50b8860c391130667a9213e3aa941e115b1e3acae5833ce4b8b52fc81aa8997c5389f5920cde86171cf5d960a7f58dbea99 SHA512 b2ae3493da1512f5f2e42ffc90529f3acfe81d75b7dd6e476f41b94e9b39e02c6fe355ea5ad40460d644ed76bca695d451721e19738c251c8ecb8acc0c0fb061
-EBUILD notepadqq-2.0.0_beta.ebuild 1042 BLAKE2B 8d3ea345c3a4d3c9ca34bfff72a2549e0a1ecc0df102e64e2bb6e3bce77661e877ba2ba5e3e1168f1225433a8eb92b9e97107c072782c3810aa6dd0c3e14da8c SHA512 3faf879c48ca8375a344e8fa14edf980aba4bdc49e3c38130feb00ce8fc37947c107ebb38221cbae3ad8ab2e72bb4bc790e88019d93fb591283eeb9df15aa2dc
-EBUILD notepadqq-9999.ebuild 1042 BLAKE2B 8d3ea345c3a4d3c9ca34bfff72a2549e0a1ecc0df102e64e2bb6e3bce77661e877ba2ba5e3e1168f1225433a8eb92b9e97107c072782c3810aa6dd0c3e14da8c SHA512 3faf879c48ca8375a344e8fa14edf980aba4bdc49e3c38130feb00ce8fc37947c107ebb38221cbae3ad8ab2e72bb4bc790e88019d93fb591283eeb9df15aa2dc
+EBUILD notepadqq-2.0.0_beta.ebuild 1035 BLAKE2B b6634b1b60db0995b920059b9a4f0802e294f3da7aee2acd03341d303cd08206f9b705642af135378ce4137eeb93f120b632e3e309f9973d5385ea01b9cc946a SHA512 29396a26e43a79aa9f4a96a9b16e1ebcb9d12dcb8f5f314d0dcf30a5da6474f6bd70fdab5d98ff8f2548e5134296505041c6efe9297d0b9176417b3f6233f08c
+EBUILD notepadqq-9999.ebuild 1035 BLAKE2B b6634b1b60db0995b920059b9a4f0802e294f3da7aee2acd03341d303cd08206f9b705642af135378ce4137eeb93f120b632e3e309f9973d5385ea01b9cc946a SHA512 29396a26e43a79aa9f4a96a9b16e1ebcb9d12dcb8f5f314d0dcf30a5da6474f6bd70fdab5d98ff8f2548e5134296505041c6efe9297d0b9176417b3f6233f08c
MISC metadata.xml 345 BLAKE2B ae751443c2fd3565e979b52de96cb3804aa010a346fe4d404c2bf69f602a14d70e59af441caa25b5c8a2ed17fdc564539ee196366dc9ff290f7b756ec8121ddc SHA512 90d1d18d81da9f0870d7e41a4c421fb58872861358fa4f095c5b040c6465752898867e47b866750f19f316fdb8fed42bc878e84ced27ddb2503ec142d035f033
diff --git a/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild b/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild
index 2da7d1d0936a..55064b0e2564 100644
--- a/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild
+++ b/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit qmake-utils xdg
DESCRIPTION="Notepad++-like editor for Linux"
-HOMEPAGE="http://notepadqq.altervista.org"
+HOMEPAGE="https://notepadqq.com/s/"
if [[ "${PV}" == 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/notepadqq/notepadqq.git"
diff --git a/app-editors/notepadqq/notepadqq-9999.ebuild b/app-editors/notepadqq/notepadqq-9999.ebuild
index 2da7d1d0936a..55064b0e2564 100644
--- a/app-editors/notepadqq/notepadqq-9999.ebuild
+++ b/app-editors/notepadqq/notepadqq-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit qmake-utils xdg
DESCRIPTION="Notepad++-like editor for Linux"
-HOMEPAGE="http://notepadqq.altervista.org"
+HOMEPAGE="https://notepadqq.com/s/"
if [[ "${PV}" == 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/notepadqq/notepadqq.git"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index b68e4f0fc4b3..617805927ad2 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 077e083e727f..71383b3ec7ac 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -4,9 +4,11 @@ AUX qemu-2.11.1-capstone_include_path.patch 264 BLAKE2B 955b498c0ea2657ee4c9d005
AUX qemu-4.0.0-mkdir_systemtap.patch 333 BLAKE2B e7e35e7fe510e7e1a86005f3d51384a81d1de7705f3b856656ec71cc0a2a29626e94918b3cc23b32e47c8073b77b62b498e71c3e956549e25ee5f4da1a8ac9cf SHA512 de48a7d663bd78051ed8a1f62d8b0b8e3bfe58d8a0001daf12518dbd087be3154e766be11c607485e7dd851b08d5675c4fb2a2fe5cf18f3b900164a4d93eab10
AUX qemu-4.2.0-cflags.patch 508 BLAKE2B 86724caca22a4bd2b21db306d04d8c0f6a542a15b82bb4e340f3ddb8471f47e854276ff33adee7bd5682ecb797efdb048e9d028d954a064712d1e817e1eb6e26 SHA512 5bfb8f0e739d7bb260b5b5b0a2d28f30b97833b8037227c511f55c9bd9502241c891e7e3780e750598ccfd7fb01615254f1c7f6634787fec67539a61a217e18d
AUX qemu-5.0.0-epoll-strace.patch 1455 BLAKE2B 8617fd020d36d0fc29d83d0340177f046ee58e08eb3663ae023647f0246450a8d65df1558731ecef06f29917411a26a97b2f9491e96efe4bf44e1a5be439999a SHA512 17f79dcc1e112d776875df281c13e12d58e43c0530718c992700d70030c9527f915193356db8e6f0fc721f8462f95305442c9393310f2a04df4d060f7e3a3f09
+AUX qemu-5.0.0-ipv6-slirp-CVE-2020-10756.patch 1149 BLAKE2B 0ac27f524129e88061e59e123d2db9a985f14eb9f37941a9424e0bb70219f842ef372a332b20ce7674f2d7e1c4d2b8e0d8b970bf1d0affb5a3ecaf936d0e7677 SHA512 adfd1b8b8c321692a770fcc8a699b12558b1b68d29e7e7dc95f01d1006da963fca04df2303e1c374bdc597e07ac36471843d729b1005c0b487db4fb9ee05147c
AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63 SHA512 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf
+EBUILD qemu-5.0.0-r1.ebuild 24608 BLAKE2B 6c63be1c37a004208e2c4342ede1b35b6b85dc150bfb3112192a557e6b89bd21193e63e5e789494b6ee3a22a642cbb6ba10db299e812f5a889e60e372ab40f0f SHA512 99595f2e7a5aec01b8750a4ae1b4f61be5b5967e2c58b9aaae044ff80a6cb5efa4393281e9b461f09f99ceef3ed40c6543c6b298e7f2449e74d6cd59015f9146
EBUILD qemu-5.0.0.ebuild 24539 BLAKE2B 556790420f61cbc42129e0996b0f95a90faa1053469bdc4c6b006fdb9f76233267e899fafc58c1c64baf947d5239638fae9198ef4604f1cb7f6bcc5d005a0ee2 SHA512 83c7093c429fcbf8a1b582f8672c486f79f76e1fdf94c1014b4f3e895c8c08bf294dac511ea8bd46554758a0b8d2ec8d9d3d8fbc76f9b60613056810b53dc896
EBUILD qemu-9999.ebuild 24498 BLAKE2B 0cbeeb6404826492304577500e9eec52fb4468ff68f2693e1d7688d764fafeba7e4dd25e59fcfe618f16c76cf0e7ba8fd514d1467eba5d8252dc31d52d493137 SHA512 6fb2d3e54e38c821ee123c63d71c6f68b4a6e650d0a53e47711510c3d599fb12cd9cd2c04cc21950d295abc062e039e2a82ee4e226ccf0d9f7bb16c72037bd52
MISC metadata.xml 4465 BLAKE2B ef8f4fcd42539604fd5d05228dc89b9bebe56490c20da6cd3244a9b9d8c5c66036562ff64e4a740c824a80f2fbfa70b6540873d223f4bb9f901337fe78e3012c SHA512 103ee38332f04a84527e177e9efc36847daa0bcdb6ea90a33ed8656139b7464f8d99dd6cdf7cc33460c87701786e8573cac532af2f84d5ae53d1b78c750ef770
diff --git a/app-emulation/qemu/files/qemu-5.0.0-ipv6-slirp-CVE-2020-10756.patch b/app-emulation/qemu/files/qemu-5.0.0-ipv6-slirp-CVE-2020-10756.patch
new file mode 100644
index 000000000000..d1d3c49a58f6
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-5.0.0-ipv6-slirp-CVE-2020-10756.patch
@@ -0,0 +1,35 @@
+https://gitlab.freedesktop.org/slirp/libslirp/-/commit/c7ede54cbd2e2b25385325600958ba0124e31cc0
+https://bugzilla.redhat.com/show_bug.cgi?id=1835986
+https://bugs.gentoo.org/731992
+
+From c7ede54cbd2e2b25385325600958ba0124e31cc0 Mon Sep 17 00:00:00 2001
+From: Ralf Haferkamp
+Date: Fri, 3 Jul 2020 14:51:16 +0200
+Subject: [PATCH] Drop bogus IPv6 messages
+
+Drop IPv6 message shorter than what's mentioned in the payload
+length header (+ the size of the IPv6 header). They're invalid an could
+lead to data leakage in icmp6_send_echoreply().
+---
+ src/ip6_input.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/slirp/src/ip6_input.c
++++ b/slirp/src/ip6_input.c
+@@ -49,6 +49,13 @@ void ip6_input(struct mbuf *m)
+ goto bad;
+ }
+
++ // Check if the message size is big enough to hold what's
++ // set in the payload length header. If not this is an invalid
++ // packet
++ if (m->m_len < ntohs(ip6->ip_pl) + sizeof(struct ip6)) {
++ goto bad;
++ }
++
+ /* check ip_ttl for a correct ICMP reply */
+ if (ip6->ip_hl == 0) {
+ icmp6_send_error(m, ICMP6_TIMXCEED, ICMP6_TIMXCEED_INTRANS);
+--
+GitLab
+
diff --git a/app-emulation/qemu/qemu-5.0.0-r1.ebuild b/app-emulation/qemu/qemu-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..0cfa9836a834
--- /dev/null
+++ b/app-emulation/qemu/qemu-5.0.0-r1.ebuild
@@ -0,0 +1,838 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_REQ_USE="ncurses,readline"
+
+PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
+
+FIRMWARE_ABI_VERSION="4.0.0-r50"
+
+inherit eutils linux-info toolchain-funcs multilib python-r1 \
+ udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
+ EGIT_SUBMODULES=(
+ slirp
+ tests/fp/berkeley-{test,soft}float-3
+ ui/keycodemapdb
+ )
+ inherit git-r3
+ SRC_URI=""
+else
+ SRC_URI="https://download.qemu.org/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
+ +fdt glusterfs gnutls gtk infiniband iscsi io-uring
+ jemalloc +jpeg kernel_linux
+ kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
+ plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+ smartcard snappy spice ssh static static-user systemtap tci test usb
+ usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
+ xfs +xkb zstd"
+
+COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
+ mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
+ sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
+ lm32 moxie rx tricore unicore32"
+IUSE_USER_TARGETS="${COMMON_TARGETS}
+ aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
+ tilegx"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+RESTRICT="!test? ( test )"
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ qemu_softmmu_targets_arm? ( fdt )
+ qemu_softmmu_targets_microblaze? ( fdt )
+ qemu_softmmu_targets_mips64el? ( fdt )
+ qemu_softmmu_targets_ppc64? ( fdt )
+ qemu_softmmu_targets_ppc? ( fdt )
+ qemu_softmmu_targets_riscv32? ( fdt )
+ qemu_softmmu_targets_riscv64? ( fdt )
+ static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy )
+ static-user? ( !plugins )
+ virtfs? ( xattr )
+ vte? ( gtk )
+ plugins? ( !static !static-user )
+"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected). This is because qemu supports using the C library's API
+# when available rather than always using the external library.
+ALL_DEPEND="
+ >=dev-libs/glib-2.0[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ python? ( ${PYTHON_DEPS} )
+ systemtap? ( dev-util/systemtap )
+ xattr? ( sys-apps/attr[static-libs(+)] )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+ dev-libs/libxml2[static-libs(+)]
+ xkb? ( x11-libs/libxkbcommon[static-libs(+)] )
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ accessibility? (
+ app-accessibility/brltty[api]
+ app-accessibility/brltty[static-libs(+)]
+ )
+ aio? ( dev-libs/libaio[static-libs(+)] )
+ alsa? ( >=media-libs/alsa-lib-1.0.13 )
+ bzip2? ( app-arch/bzip2[static-libs(+)] )
+ capstone? ( dev-libs/capstone:= )
+ caps? ( sys-libs/libcap-ng[static-libs(+)] )
+ curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+ fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
+ glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+ gnutls? (
+ dev-libs/nettle:=[static-libs(+)]
+ >=net-libs/gnutls-3.0:=[static-libs(+)]
+ )
+ gtk? (
+ x11-libs/gtk+:3
+ vte? ( x11-libs/vte:2.91 )
+ )
+ infiniband? (
+ sys-fabric/libibumad:=[static-libs(+)]
+ sys-fabric/libibverbs:=[static-libs(+)]
+ sys-fabric/librdmacm:=[static-libs(+)]
+ )
+ iscsi? ( net-libs/libiscsi )
+ io-uring? ( sys-libs/liburing[static-libs(+)] )
+ jemalloc? ( dev-libs/jemalloc )
+ jpeg? ( virtual/jpeg:0=[static-libs(+)] )
+ lzo? ( dev-libs/lzo:2[static-libs(+)] )
+ ncurses? (
+ sys-libs/ncurses:0=[unicode]
+ sys-libs/ncurses:0=[static-libs(+)]
+ )
+ nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+ numa? ( sys-process/numactl[static-libs(+)] )
+ opengl? (
+ virtual/opengl
+ media-libs/libepoxy[static-libs(+)]
+ media-libs/mesa[static-libs(+)]
+ media-libs/mesa[egl,gbm]
+ )
+ png? ( media-libs/libpng:0=[static-libs(+)] )
+ pulseaudio? ( media-sound/pulseaudio )
+ rbd? ( sys-cluster/ceph )
+ sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+ sdl? (
+ media-libs/libsdl2[video]
+ media-libs/libsdl2[static-libs(+)]
+ )
+ sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
+ seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+ smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+ snappy? ( app-arch/snappy:= )
+ spice? (
+ >=app-emulation/spice-protocol-0.12.3
+ >=app-emulation/spice-0.12.0[static-libs(+)]
+ )
+ ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
+ usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+ usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+ vde? ( net-misc/vde[static-libs(+)] )
+ virgl? ( media-libs/virglrenderer[static-libs(+)] )
+ virtfs? ( sys-libs/libcap )
+ xen? ( app-emulation/xen-tools:= )
+ xfs? ( sys-fs/xfsprogs[static-libs(+)] )
+ zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
+"
+
+X86_FIRMWARE_DEPEND="
+ pin-upstream-blobs? (
+ ~sys-firmware/edk2-ovmf-201905[binary]
+ ~sys-firmware/ipxe-1.0.0_p20190728[binary]
+ ~sys-firmware/seabios-1.12.0[binary,seavgabios]
+ ~sys-firmware/sgabios-0.1_pre8[binary]
+ )
+ !pin-upstream-blobs? (
+ sys-firmware/edk2-ovmf
+ sys-firmware/ipxe
+ >=sys-firmware/seabios-1.10.2[seavgabios]
+ sys-firmware/sgabios
+ )"
+PPC64_FIRMWARE_DEPEND="
+ pin-upstream-blobs? (
+ ~sys-firmware/seabios-1.12.0[binary,seavgabios]
+ )
+ !pin-upstream-blobs? (
+ >=sys-firmware/seabios-1.10.2[seavgabios]
+ )
+"
+
+BDEPEND="
+ $(python_gen_impl_dep)
+ dev-lang/perl
+ sys-apps/texinfo
+ virtual/pkgconfig
+ doc? ( dev-python/sphinx )
+ gtk? ( nls? ( sys-devel/gettext ) )
+ test? (
+ dev-libs/glib[utils]
+ sys-devel/bc
+ )
+"
+CDEPEND="
+ !static? (
+ ${ALL_DEPEND//\[static-libs(+)]}
+ ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+ )
+ qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+ qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+ qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
+"
+DEPEND="${CDEPEND}
+ kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+ static? (
+ ${ALL_DEPEND}
+ ${SOFTMMU_TOOLS_DEPEND}
+ )
+ static-user? ( ${ALL_DEPEND} )"
+RDEPEND="${CDEPEND}
+ acct-group/kvm
+ selinux? ( sec-policy/selinux-qemu )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
+ "${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
+ "${FILESDIR}"/${PN}-4.2.0-cflags.patch
+ "${FILESDIR}"/${PN}-5.0.0-epoll-strace.patch
+ "${FILESDIR}"/${PN}-5.0.0-ipv6-slirp-CVE-2020-10756.patch #731992
+)
+
+QA_PREBUILT="
+ usr/share/qemu/hppa-firmware.img
+ usr/share/qemu/openbios-ppc
+ usr/share/qemu/openbios-sparc64
+ usr/share/qemu/openbios-sparc32
+ usr/share/qemu/palcode-clipper
+ usr/share/qemu/s390-ccw.img
+ usr/share/qemu/s390-netboot.img
+ usr/share/qemu/u-boot.e500"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+ usr/bin/qemu-x86_64
+ usr/bin/qemu-alpha
+ usr/bin/qemu-arm
+ usr/bin/qemu-cris
+ usr/bin/qemu-m68k
+ usr/bin/qemu-microblaze
+ usr/bin/qemu-microblazeel
+ usr/bin/qemu-mips
+ usr/bin/qemu-mipsel
+ usr/bin/qemu-or1k
+ usr/bin/qemu-ppc
+ usr/bin/qemu-ppc64
+ usr/bin/qemu-ppc64abi32
+ usr/bin/qemu-sh4
+ usr/bin/qemu-sh4eb
+ usr/bin/qemu-sparc
+ usr/bin/qemu-sparc64
+ usr/bin/qemu-armeb
+ usr/bin/qemu-sparc32plus
+ usr/bin/qemu-s390x
+ usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+ For AMD CPUs the module is called 'kvm-amd'.
+ For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+ $ gpasswd -a kvm
+then have re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it. You can tell udev to reset ownership/perms:
+ $ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+ # rc-update add qemu-binfmt
+For systemd:
+ # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+ if use kernel_linux && kernel_is lt 2 6 25; then
+ eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+ elif use kernel_linux; then
+ if ! linux_config_exists; then
+ eerror "Unable to check your kernel for KVM support"
+ else
+ CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+ ERROR_KVM="You must enable KVM in your kernel to continue"
+ ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+ ERROR_KVM_AMD+=" your kernel configuration."
+ ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+ ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+ ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+ ERROR_TUN+=" into your kernel or loaded as a module to use the"
+ ERROR_TUN+=" virtual network device if using -net tap."
+ ERROR_BRIDGE="You will also need support for 802.1d"
+ ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+ use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+ ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+ ERROR_VHOST_NET+=" support"
+
+ if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+ if grep -q AuthenticAMD /proc/cpuinfo; then
+ CONFIG_CHECK+=" ~KVM_AMD"
+ elif grep -q GenuineIntel /proc/cpuinfo; then
+ CONFIG_CHECK+=" ~KVM_INTEL"
+ fi
+ fi
+
+ use python && CONFIG_CHECK+=" ~DEBUG_FS"
+ ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+ # Now do the actual checks setup above
+ check_extra_config
+ fi
+ fi
+
+ if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+ eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+ eerror "instances are still pointing to it. Please update your"
+ eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+ eerror "and the right system binary (e.g. qemu-system-x86_64)."
+ die "update your virt configs to not use qemu-kvm"
+ fi
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+ local var=$1 mak=$2
+ local detected sorted
+
+ pushd "${S}"/default-configs >/dev/null || die
+
+ # Force C locale until glibc is updated. #564936
+ detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+ sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+ if [[ ${sorted} != "${detected}" ]] ; then
+ eerror "The ebuild needs to be kept in sync."
+ eerror "${var}: ${sorted}"
+ eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+ die "sync ${var} to the list of targets"
+ fi
+
+ popd >/dev/null
+}
+
+handle_locales() {
+ # Make sure locale list is kept up-to-date.
+ local detected sorted
+ detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
+ sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+ if [[ ${sorted} != "${detected}" ]] ; then
+ eerror "The ebuild needs to be kept in sync."
+ eerror "PLOCALES: ${sorted}"
+ eerror " po/*.po: ${detected}"
+ die "sync PLOCALES"
+ fi
+
+ # Deal with selective install of locales.
+ if use nls ; then
+ # Delete locales the user does not want. #577814
+ rm_loc() { rm po/$1.po || die; }
+ l10n_for_each_disabled_locale_do rm_loc
+ else
+ # Cheap hack to disable gettext .mo generation.
+ rm -f po/*.po
+ fi
+}
+
+src_prepare() {
+ check_targets IUSE_SOFTMMU_TARGETS softmmu
+ check_targets IUSE_USER_TARGETS linux-user
+
+ default
+
+ # Use correct toolchain to fix cross-compiling
+ tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB
+ export WINDRES=${CHOST}-windres
+
+ # Verbose builds
+ MAKEOPTS+=" V=1"
+
+ # Run after we've applied all patches.
+ handle_locales
+
+ # Remove bundled copy of libfdt
+ rm -r dtc || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+ debug-print-function ${FUNCNAME} "$@"
+
+ local buildtype=$1
+ local builddir="${S}/${buildtype}-build"
+
+ mkdir "${builddir}"
+
+ local conf_opts=(
+ --prefix=/usr
+ --sysconfdir=/etc
+ --bindir=/usr/bin
+ --libdir=/usr/$(get_libdir)
+ --datadir=/usr/share
+ --docdir=/usr/share/doc/${PF}/html
+ --mandir=/usr/share/man
+ --with-confsuffix=/qemu
+ --localstatedir=/var
+ --disable-bsd-user
+ --disable-guest-agent
+ --disable-strip
+ --disable-werror
+ # We support gnutls/nettle for crypto operations. It is possible
+ # to use gcrypt when gnutls/nettle are disabled (but not when they
+ # are enabled), but it's not really worth the hassle. Disable it
+ # all the time to avoid automatically detecting it. #568856
+ --disable-gcrypt
+ --python="${PYTHON}"
+ --cc="$(tc-getCC)"
+ --cxx="$(tc-getCXX)"
+ --host-cc="$(tc-getBUILD_CC)"
+ $(use_enable debug debug-info)
+ $(use_enable debug debug-tcg)
+ $(use_enable doc docs)
+ $(use_enable plugins)
+ $(use_enable tci tcg-interpreter)
+ $(use_enable xattr attr)
+ )
+
+ # Disable options not used by user targets. This simplifies building
+ # static user targets (USE=static-user) considerably.
+ conf_notuser() {
+ if [[ ${buildtype} == "user" ]] ; then
+ echo "--disable-${2:-$1}"
+ else
+ use_enable "$@"
+ fi
+ }
+ conf_opts+=(
+ $(conf_notuser accessibility brlapi)
+ $(conf_notuser aio linux-aio)
+ $(conf_notuser bzip2)
+ $(conf_notuser capstone)
+ $(conf_notuser caps cap-ng)
+ $(conf_notuser curl)
+ $(conf_notuser fdt)
+ $(conf_notuser glusterfs)
+ $(conf_notuser gnutls)
+ $(conf_notuser gnutls nettle)
+ $(conf_notuser gtk)
+ $(conf_notuser infiniband rdma)
+ $(conf_notuser iscsi libiscsi)
+ $(conf_notuser io-uring linux-io-uring)
+ $(conf_notuser jemalloc jemalloc)
+ $(conf_notuser jpeg vnc-jpeg)
+ $(conf_notuser kernel_linux kvm)
+ $(conf_notuser lzo)
+ $(conf_notuser ncurses curses)
+ $(conf_notuser nfs libnfs)
+ $(conf_notuser numa)
+ $(conf_notuser opengl)
+ $(conf_notuser png vnc-png)
+ $(conf_notuser rbd)
+ $(conf_notuser sasl vnc-sasl)
+ $(conf_notuser sdl)
+ $(conf_notuser sdl-image)
+ $(conf_notuser seccomp)
+ $(conf_notuser smartcard)
+ $(conf_notuser snappy)
+ $(conf_notuser spice)
+ $(conf_notuser ssh libssh)
+ $(conf_notuser usb libusb)
+ $(conf_notuser usbredir usb-redir)
+ $(conf_notuser vde)
+ $(conf_notuser vhost-net)
+ $(conf_notuser vhost-user-fs)
+ $(conf_notuser virgl virglrenderer)
+ $(conf_notuser virtfs)
+ $(conf_notuser vnc)
+ $(conf_notuser vte)
+ $(conf_notuser xen)
+ $(conf_notuser xen xen-pci-passthrough)
+ $(conf_notuser xfs xfsctl)
+ $(conf_notuser xkb xkbcommon)
+ $(conf_notuser zstd)
+ )
+
+ if [[ ${buildtype} == "user" ]] ; then
+ conf_opts+=( --disable-libxml2 )
+ else
+ conf_opts+=( --enable-libxml2 )
+ fi
+
+ if [[ ! ${buildtype} == "user" ]] ; then
+ # audio options
+ local audio_opts=(
+ # Note: backend order matters here: #716202
+ # We iterate from higher-level to lower level.
+ $(usex pulseaudio pa "")
+ $(usev sdl)
+ $(usev alsa)
+ $(usev oss)
+ )
+ conf_opts+=(
+ --audio-drv-list=$(printf "%s," "${audio_opts[@]}")
+ )
+ fi
+
+ case ${buildtype} in
+ user)
+ conf_opts+=(
+ --enable-linux-user
+ --disable-system
+ --disable-blobs
+ --disable-tools
+ )
+ local static_flag="static-user"
+ ;;
+ softmmu)
+ conf_opts+=(
+ --disable-linux-user
+ --enable-system
+ --disable-tools
+ )
+ local static_flag="static"
+ ;;
+ tools)
+ conf_opts+=(
+ --disable-linux-user
+ --disable-system
+ --disable-blobs
+ --enable-tools
+ )
+ local static_flag="static"
+ ;;
+ esac
+
+ local targets="${buildtype}_targets"
+ [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+ # Add support for SystemTAP
+ use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+ # We always want to attempt to build with PIE support as it results
+ # in a more secure binary. But it doesn't work with static or if
+ # the current GCC doesn't have PIE support.
+ if use ${static_flag}; then
+ conf_opts+=( --static --disable-pie )
+ else
+ tc-enables-pie && conf_opts+=( --enable-pie )
+ fi
+
+ echo "../configure ${conf_opts[*]}"
+ cd "${builddir}"
+ ../configure "${conf_opts[@]}" || die "configure failed"
+
+ # FreeBSD's kernel does not support QEMU assigning/grabbing
+ # host USB devices yet
+ use kernel_FreeBSD && \
+ sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+ local target
+
+ python_setup
+
+ softmmu_targets= softmmu_bins=()
+ user_targets= user_bins=()
+
+ for target in ${IUSE_SOFTMMU_TARGETS} ; do
+ if use "qemu_softmmu_targets_${target}"; then
+ softmmu_targets+=",${target}-softmmu"
+ softmmu_bins+=( "qemu-system-${target}" )
+ fi
+ done
+
+ for target in ${IUSE_USER_TARGETS} ; do
+ if use "qemu_user_targets_${target}"; then
+ user_targets+=",${target}-linux-user"
+ user_bins+=( "qemu-${target}" )
+ fi
+ done
+
+ softmmu_targets=${softmmu_targets#,}
+ user_targets=${user_targets#,}
+
+ [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+ [[ -n ${user_targets} ]] && qemu_src_configure "user"
+ qemu_src_configure "tools"
+}
+
+src_compile() {
+ if [[ -n ${user_targets} ]]; then
+ cd "${S}/user-build"
+ default
+ fi
+
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ default
+ fi
+
+ cd "${S}/tools-build"
+ default
+}
+
+src_test() {
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ pax-mark m */qemu-system-* #515550
+ emake check
+ fi
+}
+
+qemu_python_install() {
+ python_domodule "${S}/python/qemu"
+
+ python_doscript "${S}/scripts/kvm/vmxcap"
+ python_doscript "${S}/scripts/qmp/qmp-shell"
+ python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+ local out="${T}/qemu-binfmt"
+ local out_systemd="${T}/qemu.conf"
+ local d="${T}/binfmt.d"
+
+ einfo "Generating qemu binfmt scripts and configuration files"
+
+ # Generate the debian fragments first.
+ mkdir -p "${d}"
+ "${S}"/scripts/qemu-binfmt-conf.sh \
+ --debian \
+ --exportdir "${d}" \
+ --qemu-path "${EPREFIX}/usr/bin" \
+ || die
+ # Then turn the fragments into a shell script we can source.
+ sed -E -i \
+ -e 's:^([^ ]+) (.*)$:\1="\2":' \
+ "${d}"/* || die
+
+ # Generate the init.d script by assembling the fragments from above.
+ local f qcpu package interpreter magic mask
+ cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+ for f in "${d}"/qemu-* ; do
+ source "${f}"
+
+ # Normalize the cpu logic like we do in the init.d for the native cpu.
+ qcpu=${package#qemu-}
+ case ${qcpu} in
+ arm*) qcpu="arm";;
+ mips*) qcpu="mips";;
+ ppc*) qcpu="ppc";;
+ s390*) qcpu="s390";;
+ sh*) qcpu="sh";;
+ sparc*) qcpu="sparc";;
+ esac
+
+ # we use 'printf' here to be portable across 'sh'
+ # implementations: #679168
+ cat <>"${out}"
+ if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+ printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+ fi
+EOF
+
+ echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+ done
+ cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+ if [[ -n ${user_targets} ]]; then
+ cd "${S}/user-build"
+ emake DESTDIR="${ED}" install
+
+ # Install binfmt handler init script for user targets.
+ generate_initd
+ doinitd "${T}/qemu-binfmt"
+
+ # Install binfmt/qemu.conf.
+ insinto "/usr/share/qemu/binfmt.d"
+ doins "${T}/qemu.conf"
+ fi
+
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ emake DESTDIR="${ED}" install
+
+ # This might not exist if the test failed. #512010
+ [[ -e check-report.html ]] && dodoc check-report.html
+
+ if use kernel_linux; then
+ udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
+ fi
+
+ if use python; then
+ python_foreach_impl qemu_python_install
+ fi
+ fi
+
+ cd "${S}/tools-build"
+ emake DESTDIR="${ED}" install
+
+ # Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+ pushd "${ED}"/usr/bin >/dev/null
+ pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+ popd >/dev/null
+
+ # Install config file example for qemu-bridge-helper
+ insinto "/etc/qemu"
+ doins "${FILESDIR}/bridge.conf"
+
+ cd "${S}"
+ dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+ newdoc pc-bios/README README.pc-bios
+
+ # Disallow stripping of prebuilt firmware files.
+ dostrip -x ${QA_PREBUILT}
+
+ if [[ -n ${softmmu_targets} ]]; then
+ # Remove SeaBIOS since we're using the SeaBIOS packaged one
+ rm "${ED}/usr/share/qemu/bios.bin"
+ rm "${ED}/usr/share/qemu/bios-256k.bin"
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+ dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+ dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+ fi
+
+ # Remove vgabios since we're using the seavgabios packaged one
+ rm "${ED}/usr/share/qemu/vgabios.bin"
+ rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+ rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+ rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+ rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+ rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+ # PPC64 loads vgabios-stdvga
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
+ dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+ dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+ dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+ dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+ dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+ dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+ fi
+
+ # Remove sgabios since we're using the sgabios packaged one
+ rm "${ED}/usr/share/qemu/sgabios.bin"
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+ dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+ fi
+
+ # Remove iPXE since we're using the iPXE packaged one
+ rm "${ED}"/usr/share/qemu/pxe-*.rom
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+ dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+ dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+ dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+ dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+ dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+ dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+ fi
+ fi
+
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+ local pv
+ for pv in ${REPLACING_VERSIONS}; do
+ if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
+ return 0
+ fi
+ done
+ return 1
+}
+
+pkg_postinst() {
+ if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+ udev_reload
+ fi
+
+ xdg_icon_cache_update
+
+ [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+ fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
+
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_print_elog
+
+ if use pin-upstream-blobs && firmware_abi_change; then
+ ewarn "This version of qemu pins new versions of firmware blobs:"
+ ewarn " $(best_version sys-firmware/edk2-ovmf)"
+ ewarn " $(best_version sys-firmware/ipxe)"
+ ewarn " $(best_version sys-firmware/seabios)"
+ ewarn " $(best_version sys-firmware/sgabios)"
+ ewarn "This might break resume of hibernated guests (started with a different"
+ ewarn "firmware version) and live migration to/from qemu versions with different"
+ ewarn "firmware. Please (cold) restart all running guests. For functional"
+ ewarn "guest migration ensure that all"
+ ewarn "hosts run at least"
+ ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+ fi
+}
+
+pkg_info() {
+ echo "Using:"
+ echo " $(best_version app-emulation/spice-protocol)"
+ echo " $(best_version sys-firmware/edk2-ovmf)"
+ if has_version 'sys-firmware/edk2-ovmf[binary]'; then
+ echo " USE=binary"
+ else
+ echo " USE=''"
+ fi
+ echo " $(best_version sys-firmware/ipxe)"
+ echo " $(best_version sys-firmware/seabios)"
+ if has_version 'sys-firmware/seabios[binary]'; then
+ echo " USE=binary"
+ else
+ echo " USE=''"
+ fi
+ echo " $(best_version sys-firmware/sgabios)"
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index 78ffd3c563b0..0f2a493eb34d 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,5 +1,7 @@
DIST slirp4netns-1.0.1.tar.gz 51911 BLAKE2B d125dd2c24fd7a817d2b8f16c6bac66399a4a0f37c49d43541f336e7ff09673bca2d6ed2c62cc856034b8e2f6e11ac1ff3753d3546148e68ddf085e8b9aca354 SHA512 4947e32d88c3c8f1b7b2e94a1e73041a48cc8ddf75ffaf691d44cb6ebeaef5cf0b0abb7a8df8919682dfc854a76d73fc5bdebcf01b3ace97be187068d704bf63
DIST slirp4netns-1.1.1.tar.gz 55391 BLAKE2B 346fd9a0e52247488573182bf747d3ba249ba5cb8d991ede8d0dedb7a5b9c8c64ee56fe4a94ae6deffc98f85866aa100300b42c75f1fc4de3af2564a00082ac5 SHA512 365293c82f58c89b82515428f157c7e4709b8b04b6736e75cc549bddb3ec2a85b33b198ae55ee173b93472cb33dec64949e50e8473b052ce33c61ff777f1393f
+DIST slirp4netns-1.1.3.tar.gz 55231 BLAKE2B bbe0803ae2ad453519963865e53a3e020bebb9ee9658ae552745247be4b08397e8649bd52ed46a00062aa3ca804529daa5454fb591e2b128d3f1f31f9d4229c2 SHA512 6259099eb8896aef086961d1a6dbbdaffe24af255a7ed55f2243a87e9af54956041a28de3f8af9c8a17e59925822109545c53757af2feeeefa7ce603a3b99930
EBUILD slirp4netns-1.0.1.ebuild 942 BLAKE2B 970fc2e131a194f9387230c3ce6b2516797f9cf72a0e9a7456068716cc3cff9cad4df827b55f751b44497a253eba9566bd3b175963c28f4fa7c3637553560f15 SHA512 340f4ec282e903a44770c10b7b74580bf14562f627a8fcf53b148a37d55ea85da8849960a9ebcd69a146f7a9ee1fe95c87a374c36da32149234a9eef0a86aa2b
EBUILD slirp4netns-1.1.1.ebuild 942 BLAKE2B 970fc2e131a194f9387230c3ce6b2516797f9cf72a0e9a7456068716cc3cff9cad4df827b55f751b44497a253eba9566bd3b175963c28f4fa7c3637553560f15 SHA512 340f4ec282e903a44770c10b7b74580bf14562f627a8fcf53b148a37d55ea85da8849960a9ebcd69a146f7a9ee1fe95c87a374c36da32149234a9eef0a86aa2b
+EBUILD slirp4netns-1.1.3.ebuild 942 BLAKE2B 970fc2e131a194f9387230c3ce6b2516797f9cf72a0e9a7456068716cc3cff9cad4df827b55f751b44497a253eba9566bd3b175963c28f4fa7c3637553560f15 SHA512 340f4ec282e903a44770c10b7b74580bf14562f627a8fcf53b148a37d55ea85da8849960a9ebcd69a146f7a9ee1fe95c87a374c36da32149234a9eef0a86aa2b
MISC metadata.xml 601 BLAKE2B eac6bf1b21371c913f648e944a1ba75314e772c1f0f5fdeda9d4c49cf279a15c19c9f6347ec1a3df236a6147c3d01f4084e161a81c2ee1e4db55cc9f8508d26f SHA512 d81b6889e71bf3fdc539f6c5ca057a8900f13009eafb711c4d83bb0cb349cf49f9253c0b8207a4c1f4c3b084bc9c9b0b91e75109843662fb72d25a2485cbf7dd
diff --git a/app-emulation/slirp4netns/slirp4netns-1.1.3.ebuild b/app-emulation/slirp4netns/slirp4netns-1.1.3.ebuild
new file mode 100644
index 000000000000..2d9af4a06ab7
--- /dev/null
+++ b/app-emulation/slirp4netns/slirp4netns-1.1.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="User-mode networking for unprivileged network namespaces"
+HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
+SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+ dev-libs/glib:2=
+ dev-libs/libpcre:=
+ net-libs/libslirp:=
+ sys-libs/libseccomp:=
+ sys-libs/libcap:="
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+RESTRICT="test"
+
+src_prepare() {
+ # Respect AR variable for bug 722162.
+ sed -e 's|^AC_PROG_CC$|AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])\nAC_PROG_AR\n\0|' \
+ -i configure.ac || die
+ eautoreconf
+ default
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "You need to have the tun kernel module loaded in order to have"
+ elog "slirp4netns working"
+ fi
+}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 81a2a1307c5e..6963ce0e42f5 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo-patches.conf 2282 BLAKE2B f0c369e500213ed72736082719f1b6a7188d1ab92151451704947cce3f8fe597328385cc85c97e9c249da7699d32edf3f97bfe07922e14eb01c8dee4367ee624 SHA512 d6673d82224ac01e7257110aa213ab4c898adabc653fa99d78314731d410ac094f87d16a625e682bddf2cc9dac1365780f44cbe592f02f32c064c37707714a71
+AUX gentoo-patches.conf 2114 BLAKE2B bcb43e251ccf967b23122169ae061b9e4d6d8f80901044ecb10df121ec4529e7666a28c38d82b0f047d1a4b642c59a3e14773391035dee46800402f1dc97b37a SHA512 cf129a9febf952b74abf4d16a73d115725facdd538a89474a7e681525f815ae39af450249924f738a88697132590551c37255478e548006f814883f49f9ef29e
AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b
@@ -23,18 +23,16 @@ DIST ipxe-git-d2063b7693e0e35db97b2264aa987eb6341ae779.tar.gz 3792227 BLAKE2B 72
DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27
DIST seabios-1.12.1.tar.gz 613450 BLAKE2B cb926b650c41a9962db407945cb5b6558079b061bd61f32ea56aedf0d37a00d10ad4434acbe717ffbc0dd1d1c0767304af8e640a53b0fc3784969dfa1590f681 SHA512 58755ce842adcb99c0f2f3ebbf9ec6d4a5072753966ab46805a96db1570847b109a90e6e03d61f9088ef877ca8ba96a8006777dc38ec434fce6b487f6c1f91d0
DIST seabios-1.13.0.tar.gz 620952 BLAKE2B 460a7dd2b2775b981bbd890ed0a50fe905794c68b0b895799667dd1378bb84125712330c2f6945112709d42cfb7b01196c7fff99051e44b6211d47d19531cfae SHA512 7f158badf7deecc2998eab2a08f3615dfe5a7c0a51323f7b4568a4d1280935bc32bb466c8226d87d2ca7e13f9f117ff0092befcc0699bc31c5018e84754e8393
-DIST xen-4.12.2-upstream-patches-0.tar.xz 3976 BLAKE2B 4527b5699b13e1b5bed9b82b67c7a3ddfbe39dc69f63b3bb1fda81cb315c6d78a34441219b8d4ae3d95ae2bc52ef0779410b65813212fa07867061fcb2b599ac SHA512 462de147b0474ca8e051219b41b088f25eb4be3962cde399403be5fbcfd4747054f84bf8c732ba8d86c1ba1980c518b67cd8e4f342e4120dd8bf6594d185a92e
-DIST xen-4.12.2.tar.gz 26985135 BLAKE2B 530821011a6dd0ac0a99fb135ff5311eb8e975c3791818093b5e250eed7854d153de6d4340197f9b949c0ad2c3d7b2b7180deb42bc71748ff70ff6fad195269d SHA512 7d9e7921271830c9eadf1bb8eca1aec20d343ad7475b0dc3165ef6d681759e7cb70739f8d9f85622a23aef960988820e822267fb198b12ee3dd657ad6164069f
DIST xen-4.12.3-upstream-patches-0.tar.xz 7236 BLAKE2B d795e2be6f1edb31f1d794912328c4d3673eb800464d99c5ae867d189d0ea2b4cbac0c8bcda7790ae40742f6bf79308eb624b4f67d1c7f12cc64be6d8c920b84 SHA512 de5723d4fd547845ca9a876f8535e720f7bd790e48dbf1d92397d60a285ef88a31cad276b1a01a4fa8946cefb15d69c8a3a00da5113b6e5e2655b871be076adf
+DIST xen-4.12.3-upstream-patches-1.tar.xz 39052 BLAKE2B dbe18a8d67009be9597ea8f0cd45850ed0e437119095c414796efff2810e884a3d7c062a7e5e12e93d8991cbbab50c0095d7ae1c937129f8f9490aa5f31ca6f8 SHA512 1383b1c0e3d4918b6b43c9cdff5284e259385136aad479814ea1d50b25017a0466a6a0044321585f38f4c8fb30f5af91a45f666a6d7fce6e60a4dfdb346a421b
DIST xen-4.12.3.tar.gz 26985230 BLAKE2B 403de519a552f1cd49e5a85b63f48df1b7a47ff8381385860b67df32af0b33be1c13c92ca2234e4479b7f415e711e0f46c396c3f62dfb5b2465d2991723cf6ef SHA512 7bbf4e752477f18143ac9a62fb633b1fbe115a1a9b03d0132f33dfca025bc9b76d9c2e9b66a3e407d14aff161b940b1a82e3e3ca43213798e9dd38b6970194e0
-DIST xen-4.13.1-upstream-patches-0.tar.xz 7156 BLAKE2B 246b30cd8bc0ee8853a4e85ae0140d0ae52e69f3e4220bd97af8564491cf8285a7a592cd1392467a30acf6947733c8af355c110a44cb565927fb4f0bb7867113 SHA512 9059de696cb984c1891b5a87d1832562aa34b6568a21867c6744b603180f2b628905c81031f3c7c24867122d07432906750e0cfc6ca2fdacd31b82d35488455f
+DIST xen-4.13.1-upstream-patches-1.tar.xz 46892 BLAKE2B 8ccfe1d6b3589e262fa04526d5238694e324fef3b514daebdffcb74cecfc2700e37f810faf868ec198c99ed3a9af2c351656c31798c5791bfd6816552d78fd7a SHA512 2d9708c4b558c5986afd1caea56f69ac8b11d69371fd4afae0e9c3480a0b863c99ebe2d3b857d623d41924437db7f7e44fefc7bae892cd05d7605243ae8140d5
DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95 SHA512 b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90
DIST xen-4.14.0-rc3.tar.gz 39943460 BLAKE2B 12356947738cfc7b43d0fa1bcbc8912f87fa5f0368b02b2bd8cc1d2681edc2f26d8edce50991e5fab65aa40f32ce263a2ded80f8ae827f182ea5a0f63274ddc2 SHA512 c6771003f2f66334c9181faeb01cb3283fcbfda78064cfde3a14ae9dca2454c35766d78df23dc480a9daba1edb7fd31db9ebfc3a4f57dd2b07852dd486e859ed
-DIST xen-gentoo-patches-20.tar.xz 17376 BLAKE2B 909795f611a089ab1eee86db5f034cec963c831873b3088f0682cdb7ec5284e75a4d49a5a1c93ee7a7e7ba3a899648b38928a1c7b726e019c2a90b66e31fee4a SHA512 d06b846ccb8c488f7155437cdf220533fc2d23ad13b0a2bd4d69d68938c4858fdb961c9e59f57c5228368b4e60dbbdf81ec15b77ecb0639bbf475333f8bf4b97
DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1 SHA512 3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d
DIST xen-gentoo-patches-22.tar.xz 18764 BLAKE2B e0da49b39fbc6b689db47e40a4fbb4f6568644fe192b114cce01b0406cba4bf23339ad1bf39b972f895df004916827b6e774f97fc079aeb8ac436763efda5fc3 SHA512 5b7959af4ed30edd2526698ab60a86353e35d9dc48dc941b6df7659a7c4904260461e0decbd8d788542bd69384736f2175861d4943c3738618d20788b19ea9b1
-EBUILD xen-tools-4.12.2-r1.ebuild 14966 BLAKE2B df7d4e20a1184631204f0e6f31f041c52bfd09a4c6d883a80d58f0d88cc96ec1cff25659a8995383a00f153d020b22c1e8a3a3f0e7c807dff382cae9411f2db6 SHA512 f26b572cd184cf0243d9b0c54dfb6746ecf52696e5e96858262def32530515d503a5cfbdf3f39ab8d029f4cb72a32f84f78f842f7fdfb4cf0f6e8b346a593090
EBUILD xen-tools-4.12.3-r1.ebuild 15181 BLAKE2B 39160d51e8c2d0a6452d4a4eaa6e95237f3e5fe5d8d945733a69402c9ac16aee82879605cc61020035ca9a82ef6f6e8c7030a21daadf7de8815147040d9bdad3 SHA512 7f85d1919c6d9c93bff1b1b22cf86660cc4b776de4d910549840add24c209fb67c57cc802ef448852b85b1c8236f57457e258469916801fa5858aed22f73010c
-EBUILD xen-tools-4.13.1-r1.ebuild 15865 BLAKE2B b5c85654d0c166053891f045db686be4ed88c3252bbdf370e480500d94b7b189934d3930658159b6c6734d3b7d4664201e3c61c02b9be891cd491e584e0d6a66 SHA512 993b4b5675932eab2a2748d89faa58e0666d7dd36a39ed86da0ee21d45b4a002dbb559cdcf7b4ed3120a5a4eb9b56e64eb49daf4f525cb77188f3c24b116bcff
+EBUILD xen-tools-4.12.3-r2.ebuild 15183 BLAKE2B 15b30f929362117d89663d85462692c58e1e2c5b6b01e6907e150e7a62c1af3e2ae3286911f2213d7af4d4344c1242891868a2e7d25948787b55718fe8250732 SHA512 51de25492dee72d609b5726d54c3843777d6031818bb7aee6c2077b1298413db85ab144155e5f29445e1d912f8e36de5cec51e1a7c49b4176cc6dd296a041962
+EBUILD xen-tools-4.13.1-r2.ebuild 15865 BLAKE2B 7cfbed153528c909ca1dcd3fa668d72e59a0369a759c7e95599f0ce2682b7606cdfbe7b37678517196e920a9f0edf28fc65a6ef2708245478ba24038fe546c55 SHA512 fcca7b153ef7c8fba9e62c5714163286b5f1d7dc458b33a23afb83d93af98b2700063872745389c1669b4a11e17603654d1d9e3db6bf9a8d3e541041a6ef60e3
EBUILD xen-tools-4.14.0_rc3.ebuild 15877 BLAKE2B ff7c4dab2e1dcf2c8dcd13c819d1890b2667079f2f08d23fe4c0661b7345a3c2b36f010c0635308a5193de6c60285ee6933c56608848c3bd2f8064bf15f4f481 SHA512 b17973909ed7c3811b9d907ab3f37074211a7cea070a25b138b7aebb370f4eed763d49d69d0bd46732cfc361a7ce094d12a15be22169bf2d67f2ad5959de7bcc
MISC metadata.xml 1662 BLAKE2B 1b243436df5eb36e30f73b36db45d859aa03f7e9d3360fcdb91c35e3a1c00f1217e5e7cd1461b65d9da2883f5e8ca969b958f9b2160def4c1f15347c1887b2cd SHA512 d6cdf124c7767727f7c8d16a2dc0f85a7213db21f8d1595f7d8899c7cb81d47849fd05759ccfc460630c32917e64ea31ef6384dc050ab0eb392f571b12db68ed
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 052e818a82eb..472d8b7b3b85 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -51,16 +51,6 @@ _gx056=" xen-tools-4.12.2-libxenstat-makefile.patch"
# Fix building with gcc 10, bug #722930
_gx060=" xen-tools-4.13.0-gcc10.patch"
-# xen-tools-4.12.2 patches set
-_gpv_xen_tools_4122_0="
-${_gx038}
-${_gx027}
-${_gx028} ${_gx029}
-${_gx037} ${_gx042}
-${_gx053} ${_gx050} ${_gx051}
-${_gx054} ${_gx056}
-"
-
# xen-tools-4.12.3 patches set
_gpv_xen_tools_4123_0="
${_gx038}
diff --git a/app-emulation/xen-tools/xen-tools-4.12.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.12.2-r1.ebuild
deleted file mode 100644
index 13c5867def90..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.12.2-r1.ebuild
+++ /dev/null
@@ -1,491 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='ncurses,xml,threads'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-if [[ $PV == *9999 ]]; then
- inherit git-r3
- REPO="xen.git"
- EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
- S="${WORKDIR}/${REPO}"
-else
- KEYWORDS="amd64 ~arm ~arm64 x86"
- UPSTREAM_VER=0
- SECURITY_VER=
- # xen-tools's gentoo patches tarball
- GENTOO_VER=20
- # xen-tools's gentoo patches version which apply to this specific ebuild
- GENTOO_GPV=0
- # xen-tools ovmf's patches
- OVMF_VER=
-
- SEABIOS_VER=1.12.0
- EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56
- IPXE_COMMIT=d2063b7693e0e35db97b2264aa987eb6341ae779
-
- [[ -n ${UPSTREAM_VER} ]] && \
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
- [[ -n ${SECURITY_VER} ]] && \
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
- [[ -n ${GENTOO_VER} ]] && \
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
- [[ -n ${OVMF_VER} ]] && \
- OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
- SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
- https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
- ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
- ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
- ${OVMF_PATCHSET_URI} )
- ${UPSTREAM_PATCHSET_URI}
- ${SECURITY_PATCHSET_URI}
- ${GENTOO_PATCHSET_URI}"
-
- S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://www.xenproject.org"
-DOCS=( README )
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ipxe? ( rombios )
- ovmf? ( hvm )
- pygrub? ( python )
- rombios? ( hvm )
- system-ipxe? ( rombios )
- ?? ( ipxe system-ipxe )
- ?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
- sys-apps/pciutils
- dev-libs/lzo:2
- dev-libs/glib:2
- dev-libs/yajl
- dev-libs/libaio
- dev-libs/libgcrypt:0
- sys-libs/zlib
- ${PYTHON_DEPS}
-"
-
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-4.11
- $(python_gen_cond_dep '
- dev-python/lxml[${PYTHON_MULTI_USEDEP}]
- pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
- ')
- x86? ( sys-devel/dev86
- system-ipxe? ( sys-firmware/ipxe[qemu] )
- sys-power/iasl )
- api? ( dev-libs/libxml2
- net-misc/curl )
- ovmf? (
- !arm? ( !arm64? ( dev-lang/nasm ) )
- $(python_gen_impl_dep sqlite)
- )
- !amd64? ( >=sys-apps/dtc-1.4.0 )
- amd64? ( sys-power/iasl
- system-seabios? ( sys-firmware/seabios )
- system-ipxe? ( sys-firmware/ipxe[qemu] )
- rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
- dev-lang/perl
- app-misc/pax-utils
- doc? (
- app-text/ghostscript-gpl
- app-text/pandoc
- $(python_gen_cond_dep '
- dev-python/markdown[${PYTHON_MULTI_USEDEP}]
- ')
- dev-texlive/texlive-latexextra
- media-gfx/transfig
- )
- hvm? ( x11-base/xorg-proto )
- qemu? (
- app-arch/snappy:=
- x11-libs/pixman
- sdl? (
- media-libs/libsdl[X]
- media-libs/libsdl2[X]
- )
- )
- system-qemu? ( app-emulation/qemu[xen] )
- ocaml? ( dev-ml/findlib
- >=dev-lang/ocaml-4 )
- python? ( dev-lang/swig )"
-
-RDEPEND="${COMMON_DEPEND}
- sys-apps/iproute2[-minimal]
- net-misc/bridge-utils
- screen? (
- app-misc/screen
- app-admin/logrotate
- )"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
- usr/libexec/xen/boot/hvmloader
- usr/share/qemu-xen/qemu/hppa-firmware.img
- usr/share/qemu-xen/qemu/s390-ccw.img
- usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_PREBUILT="
- usr/libexec/xen/bin/ivshmem-client
- usr/libexec/xen/bin/ivshmem-server
- usr/libexec/xen/bin/qemu-img
- usr/libexec/xen/bin/qemu-io
- usr/libexec/xen/bin/qemu-keymap
- usr/libexec/xen/bin/qemu-nbd
- usr/libexec/xen/bin/qemu-pr-helper
- usr/libexec/xen/bin/qemu-system-i386
- usr/libexec/xen/bin/virtfs-proxy-helper
- usr/libexec/xen/libexec/xen-bridge-helper
- usr/share/qemu-xen/qemu/s390-ccw.img
- usr/share/qemu-xen/qemu/s390-netboot.img
- usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
- python_setup
- export "CONFIG_LOMOUNT=y"
-
- #bug 522642, disable compile tools/tests
- export "CONFIG_TESTS=n"
-
- if [[ -z ${XEN_TARGET_ARCH} ]] ; then
- if use x86 && use amd64; then
- die "Confusion! Both x86 and amd64 are set in your use flags!"
- elif use x86; then
- export XEN_TARGET_ARCH="x86_32"
- elif use amd64 ; then
- export XEN_TARGET_ARCH="x86_64"
- elif use arm; then
- export XEN_TARGET_ARCH="arm32"
- elif use arm64; then
- export XEN_TARGET_ARCH="arm64"
- else
- die "Unsupported architecture!"
- fi
- fi
-}
-
-src_prepare() {
- local i
-
- # Upstream's patchset
- if [[ -n ${UPSTREAM_VER} ]]; then
- einfo "Try to apply Xen Upstream patch set"
- eapply "${WORKDIR}"/patches-upstream
- fi
-
- # Security patchset
- if [[ -n ${SECURITY_VER} ]]; then
- einfo "Try to apply Xen Security patch set"
- # apply main xen patches
- # Two parallel systems, both work side by side
- # Over time they may concdense into one. This will suffice for now
- EPATCH_SUFFIX="patch"
- EPATCH_FORCE="yes"
-
- source "${WORKDIR}"/patches-security/${PV}.conf || die
-
- for i in ${XEN_SECURITY_MAIN}; do
- eapply "${WORKDIR}"/patches-security/xen/$i
- done
-
- # apply qemu-xen/upstream patches
- pushd "${S}"/tools/qemu-xen/ > /dev/null
- for i in ${XEN_SECURITY_QEMUU}; do
- eapply "${WORKDIR}"/patches-security/qemuu/$i
- done
- popd > /dev/null
-
- # apply qemu-traditional patches
- pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
- for i in ${XEN_SECURITY_QEMUT}; do
- eapply "${WORKDIR}"/patches-security/qemut/$i
- done
- popd > /dev/null
- fi
-
- # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
- mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
- pushd tools/firmware/ > /dev/null
- ln -s seabios-dir-remote seabios-dir || die
- popd > /dev/null
-
- # Gentoo's patchset
- if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
- einfo "Try to apply Gentoo specific patch set"
- source "${FILESDIR}"/gentoo-patches.conf || die
- _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
- for i in ${!_gpv}; do
- eapply "${WORKDIR}"/patches-gentoo/$i
- done
- fi
-
- # Ovmf's patchset
- if use ovmf; then
- if [[ -n ${OVMF_VER} ]];then
- einfo "Try to apply Ovmf patch set"
- pushd "${WORKDIR}"/edk2-*/ > /dev/null
- eapply "${WORKDIR}"/patches-ovmf
- popd > /dev/null
- fi
- mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
- cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
- fi
-
- # ipxe
- if use ipxe; then
- cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
- cp "${WORKDIR}/patches-gentoo/${PN}-4.12.0-ipxe-gcc9.patch" \
- tools/firmware/etherboot/patches/ipxe-gcc9.patch || die
- echo "ipxe-gcc9.patch" >> tools/firmware/etherboot/patches/series || die
- fi
-
- mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
- # Fix texi2html build error with new texi2html, qemu.doc.html
- sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
- use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
- sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
- -i tools/firmware/Makefile || die
-
- # Drop .config, fixes to gcc-4.6
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
-
- # drop flags
- unset CFLAGS
- unset LDFLAGS
- unset ASFLAGS
- unset CPPFLAGS
-
- if ! use pygrub; then
- sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
- fi
-
- if ! use python; then
- sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
- fi
-
- if ! use hvm; then
- sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
- # Bug 351648
- elif ! use x86 && ! has x86 $(get_all_abis); then
- mkdir -p "${WORKDIR}"/extra-headers/gnu || die
- touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
- export CPATH="${WORKDIR}"/extra-headers
- fi
-
- if use qemu; then
- if use sdl; then
- sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
- tools/Makefile || die
- else
- sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
- tools/qemu-xen-traditional/xen-setup || die
- sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
- tools/Makefile || die
- fi
- else
- # Don't bother with qemu, only needed for fully virtualised guests
- sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
- fi
-
- # Reset bash completion dir; Bug 472438
- sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
- -i Config.mk || die
- sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
- # xencommons, Bug #492332, sed lighter weight than patching
- sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
- -i tools/hotplug/Linux/init.d/xencommons.in || die
-
- # fix bashishm
- sed -e '/Usage/s/\$//g' \
- -i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
- # respect multilib, usr/lib/libcacard.so.0.0.0
- sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
- -i tools/qemu-xen/configure || die
-
- #bug 518136, don't build 32bit exactuable for nomultilib profile
- if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
- sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
- fi
-
- # uncomment lines in xl.conf
- sed -e 's:^#autoballoon=:autoballoon=:' \
- -e 's:^#lockfile=:lockfile=:' \
- -e 's:^#vif.default.script=:vif.default.script=:' \
- -i tools/examples/xl.conf || die
-
- # disable capstone (Bug #673474)
- sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
- -i tools/Makefile || die
-
- # disable glusterfs
- sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
- -i tools/Makefile || die
-
- default
-}
-
-src_configure() {
- local myconf="--prefix=${PREFIX}/usr \
- --libdir=${PREFIX}/usr/$(get_libdir) \
- --libexecdir=${PREFIX}/usr/libexec \
- --localstatedir=${EPREFIX}/var \
- --disable-werror \
- --disable-xen \
- --enable-tools \
- --enable-docs \
- $(use_enable api xenapi) \
- $(use_enable ipxe) \
- $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
- $(use_enable ocaml ocamltools) \
- $(use_enable ovmf) \
- $(use_enable pam) \
- $(use_enable rombios) \
- --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
- "
-
- use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
- use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
- use amd64 && myconf+=" $(use_enable qemu-traditional)"
- tc-ld-disable-gold # Bug 669570
- econf ${myconf}
-}
-
-src_compile() {
- local myopt
- use debug && myopt="${myopt} debug=y"
- use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
-
- if test-flag-CC -fno-strict-overflow; then
- append-flags -fno-strict-overflow
- fi
-
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
- if use doc; then
- emake -C docs build
- else
- emake -C docs man-pages
- fi
-}
-
-src_install() {
- # Override auto-detection in the build system, bug #382573
- export INITD_DIR=/tmp/init.d
- export CONFIG_LEAF_DIR=../tmp/default
-
- # Let the build system compile installed Python modules.
- local PYTHONDONTWRITEBYTECODE
- export PYTHONDONTWRITEBYTECODE
-
- emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
- XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
- # Created at runtime
- rm -rv "${ED}/var/run" || die
-
- # Fix the remaining Python shebangs.
- python_fix_shebang "${D}"
-
- # Remove RedHat-specific stuff
- rm -rf "${D}/tmp" || die
-
- if use doc; then
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
- dodoc -r docs/{pdf,txt}
- else
- emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
- fi
- dodoc ${DOCS[@]}
-
- newconfd "${FILESDIR}"/xendomains.confd xendomains
- newconfd "${FILESDIR}"/xenstored.confd xenstored
- newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
- newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
- newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
- newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
- newinitd "${FILESDIR}"/xencommons.initd xencommons
- newconfd "${FILESDIR}"/xencommons.confd xencommons
- newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
- newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
- newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
- if use screen; then
- cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
- cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
- keepdir /var/log/xen-consoles
- fi
-
- # For -static-libs wrt Bug 384355
- if ! use static-libs; then
- rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
- fi
-
- # for xendomains
- keepdir /etc/xen/auto
-
- # Remove files failing QA AFTER emake installs them, avoiding seeking absent files
- find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
- -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
- keepdir /var/lib/xen/dump
- keepdir /var/lib/xen/xenpaging
- keepdir /var/lib/xenstored
- keepdir /var/log/xen
-
- if use python; then
- python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py"
- python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so"
- fi
-}
-
-pkg_postinst() {
- elog "Official Xen Guide and the offical wiki page:"
- elog "https://wiki.gentoo.org/wiki/Xen"
- elog "https://wiki.xen.org/wiki/Main_Page"
- elog ""
- elog "Recommended to utilise the xencommons script to config system at boot"
- elog "Add by use of rc-update on completion of the install"
-
- if ! use hvm; then
- echo
- elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
- elog "support enable the hvm use flag."
- elog "An x86 or amd64 system is required to build HVM support."
- fi
-
- if use qemu; then
- elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
- elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
- elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
- elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
- fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.12.3-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.12.3-r2.ebuild
new file mode 100644
index 000000000000..b7a05e003bc1
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.12.3-r2.ebuild
@@ -0,0 +1,500 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ncurses,xml,threads'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+ inherit git-r3
+ REPO="xen.git"
+ EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+ S="${WORKDIR}/${REPO}"
+else
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ UPSTREAM_VER=1
+ SECURITY_VER=
+ # xen-tools's gentoo patches tarball
+ GENTOO_VER=21
+ # xen-tools's gentoo patches version which apply to this specific ebuild
+ GENTOO_GPV=0
+ # xen-tools ovmf's patches
+ OVMF_VER=
+
+ SEABIOS_VER=1.12.0
+ EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56
+ IPXE_COMMIT=d2063b7693e0e35db97b2264aa987eb6341ae779
+
+ [[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+ [[ -n ${SECURITY_VER} ]] && \
+ SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+ [[ -n ${GENTOO_VER} ]] && \
+ GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+ [[ -n ${OVMF_VER} ]] && \
+ OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+ SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+ https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
+ ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+ ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+ ${OVMF_PATCHSET_URI} )
+ ${UPSTREAM_PATCHSET_URI}
+ ${SECURITY_PATCHSET_URI}
+ ${GENTOO_PATCHSET_URI}"
+
+ S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README )
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ipxe? ( rombios )
+ ovmf? ( hvm )
+ pygrub? ( python )
+ rombios? ( hvm )
+ system-ipxe? ( rombios )
+ ?? ( ipxe system-ipxe )
+ ?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+ sys-apps/pciutils
+ dev-libs/lzo:2
+ dev-libs/glib:2
+ dev-libs/yajl
+ dev-libs/libaio
+ dev-libs/libgcrypt:0
+ sys-libs/zlib
+ ${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-4.11
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+ ')
+ x86? ( sys-devel/dev86
+ system-ipxe? ( sys-firmware/ipxe[qemu] )
+ sys-power/iasl )
+ api? ( dev-libs/libxml2
+ net-misc/curl )
+ ovmf? (
+ !arm? ( !arm64? ( dev-lang/nasm ) )
+ $(python_gen_impl_dep sqlite)
+ )
+ !amd64? ( >=sys-apps/dtc-1.4.0 )
+ amd64? ( sys-power/iasl
+ system-seabios? ( sys-firmware/seabios )
+ system-ipxe? ( sys-firmware/ipxe[qemu] )
+ rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+ dev-lang/perl
+ app-misc/pax-utils
+ doc? (
+ app-text/ghostscript-gpl
+ app-text/pandoc
+ $(python_gen_cond_dep '
+ dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+ ')
+ dev-texlive/texlive-latexextra
+ media-gfx/transfig
+ )
+ hvm? ( x11-base/xorg-proto )
+ qemu? (
+ app-arch/snappy:=
+ x11-libs/pixman
+ sdl? (
+ media-libs/libsdl[X]
+ media-libs/libsdl2[X]
+ )
+ )
+ system-qemu? ( app-emulation/qemu[xen] )
+ ocaml? ( dev-ml/findlib
+ >=dev-lang/ocaml-4 )
+ python? ( dev-lang/swig )"
+
+RDEPEND="${COMMON_DEPEND}
+ sys-apps/iproute2[-minimal]
+ net-misc/bridge-utils
+ screen? (
+ app-misc/screen
+ app-admin/logrotate
+ )"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+ usr/libexec/xen/boot/hvmloader
+ usr/share/qemu-xen/qemu/hppa-firmware.img
+ usr/share/qemu-xen/qemu/s390-ccw.img
+ usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+ usr/libexec/xen/bin/ivshmem-client
+ usr/libexec/xen/bin/ivshmem-server
+ usr/libexec/xen/bin/qemu-img
+ usr/libexec/xen/bin/qemu-io
+ usr/libexec/xen/bin/qemu-keymap
+ usr/libexec/xen/bin/qemu-nbd
+ usr/libexec/xen/bin/qemu-pr-helper
+ usr/libexec/xen/bin/qemu-system-i386
+ usr/libexec/xen/bin/virtfs-proxy-helper
+ usr/libexec/xen/libexec/xen-bridge-helper
+ usr/share/qemu-xen/qemu/s390-ccw.img
+ usr/share/qemu-xen/qemu/s390-netboot.img
+ usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+ python_setup
+ export "CONFIG_LOMOUNT=y"
+
+ #bug 522642, disable compile tools/tests
+ export "CONFIG_TESTS=n"
+
+ if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+ if use x86 && use amd64; then
+ die "Confusion! Both x86 and amd64 are set in your use flags!"
+ elif use x86; then
+ export XEN_TARGET_ARCH="x86_32"
+ elif use amd64 ; then
+ export XEN_TARGET_ARCH="x86_64"
+ elif use arm; then
+ export XEN_TARGET_ARCH="arm32"
+ elif use arm64; then
+ export XEN_TARGET_ARCH="arm64"
+ else
+ die "Unsupported architecture!"
+ fi
+ fi
+}
+
+src_prepare() {
+ local i
+
+ # Upstream's patchset
+ if [[ -n ${UPSTREAM_VER} ]]; then
+ einfo "Try to apply Xen Upstream patch set"
+ eapply "${WORKDIR}"/patches-upstream
+ fi
+
+ # Security patchset
+ if [[ -n ${SECURITY_VER} ]]; then
+ einfo "Try to apply Xen Security patch set"
+ # apply main xen patches
+ # Two parallel systems, both work side by side
+ # Over time they may concdense into one. This will suffice for now
+ EPATCH_SUFFIX="patch"
+ EPATCH_FORCE="yes"
+
+ source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+ for i in ${XEN_SECURITY_MAIN}; do
+ eapply "${WORKDIR}"/patches-security/xen/$i
+ done
+
+ # apply qemu-xen/upstream patches
+ pushd "${S}"/tools/qemu-xen/ > /dev/null
+ for i in ${XEN_SECURITY_QEMUU}; do
+ eapply "${WORKDIR}"/patches-security/qemuu/$i
+ done
+ popd > /dev/null
+
+ # apply qemu-traditional patches
+ pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+ for i in ${XEN_SECURITY_QEMUT}; do
+ eapply "${WORKDIR}"/patches-security/qemut/$i
+ done
+ popd > /dev/null
+ fi
+
+ # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+ mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+ pushd tools/firmware/ > /dev/null
+ ln -s seabios-dir-remote seabios-dir || die
+ popd > /dev/null
+
+ # Gentoo's patchset
+ if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+ einfo "Try to apply Gentoo specific patch set"
+ source "${FILESDIR}"/gentoo-patches.conf || die
+ _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+ for i in ${!_gpv}; do
+ eapply "${WORKDIR}"/patches-gentoo/$i
+ done
+ fi
+
+ # Ovmf's patchset
+ if use ovmf; then
+ if [[ -n ${OVMF_VER} ]];then
+ einfo "Try to apply Ovmf patch set"
+ pushd "${WORKDIR}"/edk2-*/ > /dev/null
+ eapply "${WORKDIR}"/patches-ovmf
+ popd > /dev/null
+ fi
+ mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+ cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+ fi
+
+ # ipxe
+ if use ipxe; then
+ cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
+
+ # gcc 9
+ cp "${WORKDIR}/patches-gentoo/${PN}-4.12.0-ipxe-gcc9.patch" \
+ tools/firmware/etherboot/patches/ipxe-gcc9.patch || die
+ echo "ipxe-gcc9.patch" >> tools/firmware/etherboot/patches/series || die
+
+ # gcc 10
+ cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" \
+ tools/firmware/etherboot/patches/ipxe-gcc10.patch || die
+ echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die
+ fi
+
+ mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+ # Fix texi2html build error with new texi2html, qemu.doc.html
+ sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+ use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+ sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+ -i tools/firmware/Makefile || die
+
+ # Drop .config, fixes to gcc-4.6
+ sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
+
+ # drop flags
+ unset CFLAGS
+ unset LDFLAGS
+ unset ASFLAGS
+ unset CPPFLAGS
+
+ if ! use pygrub; then
+ sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+ fi
+
+ if ! use python; then
+ sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+ fi
+
+ if ! use hvm; then
+ sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+ # Bug 351648
+ elif ! use x86 && ! has x86 $(get_all_abis); then
+ mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+ touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+ export CPATH="${WORKDIR}"/extra-headers
+ fi
+
+ if use qemu; then
+ if use sdl; then
+ sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+ tools/Makefile || die
+ else
+ sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+ tools/qemu-xen-traditional/xen-setup || die
+ sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+ tools/Makefile || die
+ fi
+ else
+ # Don't bother with qemu, only needed for fully virtualised guests
+ sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
+ fi
+
+ # Reset bash completion dir; Bug 472438
+ sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+ -i Config.mk || die
+ sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+ # xencommons, Bug #492332, sed lighter weight than patching
+ sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+ -i tools/hotplug/Linux/init.d/xencommons.in || die
+
+ # fix bashishm
+ sed -e '/Usage/s/\$//g' \
+ -i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+ # respect multilib, usr/lib/libcacard.so.0.0.0
+ sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+ -i tools/qemu-xen/configure || die
+
+ #bug 518136, don't build 32bit exactuable for nomultilib profile
+ if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+ sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+ fi
+
+ # uncomment lines in xl.conf
+ sed -e 's:^#autoballoon=:autoballoon=:' \
+ -e 's:^#lockfile=:lockfile=:' \
+ -e 's:^#vif.default.script=:vif.default.script=:' \
+ -i tools/examples/xl.conf || die
+
+ # disable capstone (Bug #673474)
+ sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+ -i tools/Makefile || die
+
+ # disable glusterfs
+ sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+ -i tools/Makefile || die
+
+ default
+}
+
+src_configure() {
+ local myconf="--prefix=${PREFIX}/usr \
+ --libdir=${PREFIX}/usr/$(get_libdir) \
+ --libexecdir=${PREFIX}/usr/libexec \
+ --localstatedir=${EPREFIX}/var \
+ --disable-werror \
+ --disable-xen \
+ --enable-tools \
+ --enable-docs \
+ $(use_enable api xenapi) \
+ $(use_enable ipxe) \
+ $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
+ $(use_enable ocaml ocamltools) \
+ $(use_enable ovmf) \
+ $(use_enable pam) \
+ $(use_enable rombios) \
+ --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+ "
+
+ use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+ use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+ use amd64 && myconf+=" $(use_enable qemu-traditional)"
+ tc-ld-disable-gold # Bug 669570
+ econf ${myconf}
+}
+
+src_compile() {
+ local myopt
+ use debug && myopt="${myopt} debug=y"
+ use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
+
+ if test-flag-CC -fno-strict-overflow; then
+ append-flags -fno-strict-overflow
+ fi
+
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+ if use doc; then
+ emake -C docs build
+ else
+ emake -C docs man-pages
+ fi
+}
+
+src_install() {
+ # Override auto-detection in the build system, bug #382573
+ export INITD_DIR=/tmp/init.d
+ export CONFIG_LEAF_DIR=../tmp/default
+
+ # Let the build system compile installed Python modules.
+ local PYTHONDONTWRITEBYTECODE
+ export PYTHONDONTWRITEBYTECODE
+
+ emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+ XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+ # Created at runtime
+ rm -rv "${ED}/var/run" || die
+
+ # Fix the remaining Python shebangs.
+ python_fix_shebang "${D}"
+
+ # Remove RedHat-specific stuff
+ rm -rf "${D}"/tmp || die
+
+ if use doc; then
+ emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+ dodoc -r docs/{pdf,txt}
+ else
+ emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+ fi
+ dodoc ${DOCS[@]}
+
+ newconfd "${FILESDIR}"/xendomains.confd xendomains
+ newconfd "${FILESDIR}"/xenstored.confd xenstored
+ newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+ newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+ newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+ newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+ newinitd "${FILESDIR}"/xencommons.initd xencommons
+ newconfd "${FILESDIR}"/xencommons.confd xencommons
+ newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+ newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+ newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+ if use screen; then
+ cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+ cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+ keepdir /var/log/xen-consoles
+ fi
+
+ # For -static-libs wrt Bug 384355
+ if ! use static-libs; then
+ rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
+ fi
+
+ # for xendomains
+ keepdir /etc/xen/auto
+
+ # Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+ find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+ -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+ keepdir /var/lib/xen/dump
+ keepdir /var/lib/xen/xenpaging
+ keepdir /var/lib/xenstored
+ keepdir /var/log/xen
+
+ if use python; then
+ python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py"
+ python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so"
+ fi
+
+ python_optimize
+}
+
+pkg_postinst() {
+ elog "Official Xen Guide and the offical wiki page:"
+ elog "https://wiki.gentoo.org/wiki/Xen"
+ elog "https://wiki.xen.org/wiki/Main_Page"
+ elog ""
+ elog "Recommended to utilise the xencommons script to config system at boot"
+ elog "Add by use of rc-update on completion of the install"
+
+ if ! use hvm; then
+ echo
+ elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+ elog "support enable the hvm use flag."
+ elog "An x86 or amd64 system is required to build HVM support."
+ fi
+
+ if use qemu; then
+ elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+ elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
+ elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
+ elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+ fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.13.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.13.1-r1.ebuild
deleted file mode 100644
index 0d79a70f5295..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.13.1-r1.ebuild
+++ /dev/null
@@ -1,505 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='ncurses,xml,threads(+)'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-if [[ $PV == *9999 ]]; then
- inherit git-r3
- REPO="xen.git"
- EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
- S="${WORKDIR}/${REPO}"
-else
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
- UPSTREAM_VER=0
- SECURITY_VER=
- # xen-tools's gentoo patches tarball
- GENTOO_VER=21
- # xen-tools's gentoo patches version which apply to this specific ebuild
- GENTOO_GPV=0
- # xen-tools ovmf's patches
- OVMF_VER=
-
- SEABIOS_VER="1.12.1"
- EDK2_COMMIT="20d2e5a125e34fc8501026613a71549b2a1a3e54"
- EDK2_OPENSSL_VERSION="1_1_1b"
- EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
- IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6"
-
- [[ -n ${UPSTREAM_VER} ]] && \
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
- [[ -n ${SECURITY_VER} ]] && \
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
- [[ -n ${GENTOO_VER} ]] && \
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
- [[ -n ${OVMF_VER} ]] && \
- OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
- SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
- https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz
- ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
- ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
- https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
- https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
- ${OVMF_PATCHSET_URI} )
- ${UPSTREAM_PATCHSET_URI}
- ${SECURITY_PATCHSET_URI}
- ${GENTOO_PATCHSET_URI}"
-
- S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://www.xenproject.org"
-DOCS=( README )
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ipxe? ( rombios )
- ovmf? ( hvm )
- pygrub? ( python )
- rombios? ( hvm )
- system-ipxe? ( rombios )
- ?? ( ipxe system-ipxe )
- ?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
- sys-apps/pciutils
- dev-libs/lzo:2
- dev-libs/glib:2
- dev-libs/yajl
- dev-libs/libaio
- dev-libs/libgcrypt:0
- sys-libs/zlib
- ${PYTHON_DEPS}
-"
-
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-4.11
- $(python_gen_cond_dep '
- dev-python/lxml[${PYTHON_MULTI_USEDEP}]
- pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
- ')
- x86? ( sys-devel/dev86
- system-ipxe? ( sys-firmware/ipxe[qemu] )
- sys-power/iasl )
- api? ( dev-libs/libxml2
- net-misc/curl )
-
- ovmf? (
- !arm? ( !arm64? ( dev-lang/nasm ) )
- $(python_gen_impl_dep sqlite)
- )
- !amd64? ( >=sys-apps/dtc-1.4.0 )
- amd64? ( sys-power/iasl
- system-seabios? ( sys-firmware/seabios )
- system-ipxe? ( sys-firmware/ipxe[qemu] )
- rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
- dev-lang/perl
- app-misc/pax-utils
- doc? (
- app-text/ghostscript-gpl
- app-text/pandoc
- $(python_gen_cond_dep '
- dev-python/markdown[${PYTHON_MULTI_USEDEP}]
- ')
- dev-texlive/texlive-latexextra
- media-gfx/transfig
- )
- hvm? ( x11-base/xorg-proto )
- qemu? (
- app-arch/snappy:=
- x11-libs/pixman
- sdl? (
- media-libs/libsdl[X]
- media-libs/libsdl2[X]
- )
- )
- system-qemu? ( app-emulation/qemu[xen] )
- ocaml? ( dev-ml/findlib
- >=dev-lang/ocaml-4 )
- python? ( >=dev-lang/swig-4.0.0 )"
-
-RDEPEND="${COMMON_DEPEND}
- sys-apps/iproute2[-minimal]
- net-misc/bridge-utils
- screen? (
- app-misc/screen
- app-admin/logrotate
- )"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
- usr/libexec/xen/boot/hvmloader
- usr/share/qemu-xen/qemu/hppa-firmware.img
- usr/share/qemu-xen/qemu/s390-ccw.img
- usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_PREBUILT="
- usr/libexec/xen/bin/elf2dmp
- usr/libexec/xen/bin/ivshmem-client
- usr/libexec/xen/bin/ivshmem-server
- usr/libexec/xen/bin/qemu-edid
- usr/libexec/xen/bin/qemu-img
- usr/libexec/xen/bin/qemu-io
- usr/libexec/xen/bin/qemu-keymap
- usr/libexec/xen/bin/qemu-nbd
- usr/libexec/xen/bin/qemu-pr-helper
- usr/libexec/xen/bin/qemu-system-i386
- usr/libexec/xen/bin/virtfs-proxy-helper
- usr/libexec/xen/libexec/xen-bridge-helper
- usr/share/qemu-xen/qemu/s390-ccw.img
- usr/share/qemu-xen/qemu/s390-netboot.img
- usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
- python_setup
- export "CONFIG_LOMOUNT=y"
-
- #bug 522642, disable compile tools/tests
- export "CONFIG_TESTS=n"
-
- if [[ -z ${XEN_TARGET_ARCH} ]] ; then
- if use x86 && use amd64; then
- die "Confusion! Both x86 and amd64 are set in your use flags!"
- elif use x86; then
- export XEN_TARGET_ARCH="x86_32"
- elif use amd64 ; then
- export XEN_TARGET_ARCH="x86_64"
- elif use arm; then
- export XEN_TARGET_ARCH="arm32"
- elif use arm64; then
- export XEN_TARGET_ARCH="arm64"
- else
- die "Unsupported architecture!"
- fi
- fi
-}
-
-src_prepare() {
- local i
-
- # Upstream's patchset
- if [[ -n ${UPSTREAM_VER} ]]; then
- einfo "Try to apply Xen Upstream patch set"
- eapply "${WORKDIR}"/patches-upstream
- fi
-
- # Security patchset
- if [[ -n ${SECURITY_VER} ]]; then
- einfo "Try to apply Xen Security patch set"
- # apply main xen patches
- # Two parallel systems, both work side by side
- # Over time they may concdense into one. This will suffice for now
- EPATCH_SUFFIX="patch"
- EPATCH_FORCE="yes"
-
- source "${WORKDIR}"/patches-security/${PV}.conf || die
-
- for i in ${XEN_SECURITY_MAIN}; do
- eapply "${WORKDIR}"/patches-security/xen/$i
- done
-
- # apply qemu-xen/upstream patches
- pushd "${S}"/tools/qemu-xen/ > /dev/null
- for i in ${XEN_SECURITY_QEMUU}; do
- eapply "${WORKDIR}"/patches-security/qemuu/$i
- done
- popd > /dev/null
-
- # apply qemu-traditional patches
- pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
- for i in ${XEN_SECURITY_QEMUT}; do
- eapply "${WORKDIR}"/patches-security/qemut/$i
- done
- popd > /dev/null
- fi
-
- # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
- mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
- pushd tools/firmware/ > /dev/null
- ln -s seabios-dir-remote seabios-dir || die
- popd > /dev/null
-
- # Gentoo's patchset
- if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
- einfo "Try to apply Gentoo specific patch set"
- source "${FILESDIR}"/gentoo-patches.conf || die
- _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
- for i in ${!_gpv}; do
- eapply "${WORKDIR}"/patches-gentoo/$i
- done
- fi
-
- # Ovmf's patchset
- if use ovmf; then
- if [[ -n ${OVMF_VER} ]];then
- einfo "Try to apply Ovmf patch set"
- pushd "${WORKDIR}"/edk2-*/ > /dev/null
- eapply "${WORKDIR}"/patches-ovmf
- popd > /dev/null
- fi
- mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
- rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
- rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
- mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
- mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
- cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
- fi
-
- # ipxe
- if use ipxe; then
- cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
-
- # gcc 10
- cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die
- echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die
- fi
-
- mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
- # Fix texi2html build error with new texi2html, qemu.doc.html
- sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
- use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
- sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
- -i tools/firmware/Makefile || die
-
- # Drop .config, fixes to gcc-4.6
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
-
- # drop flags
- unset CFLAGS
- unset LDFLAGS
- unset ASFLAGS
- unset CPPFLAGS
-
- if ! use pygrub; then
- sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
- fi
-
- if ! use python; then
- sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
- fi
-
- if ! use hvm; then
- sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
- # Bug 351648
- elif ! use x86 && ! has x86 $(get_all_abis); then
- mkdir -p "${WORKDIR}"/extra-headers/gnu || die
- touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
- export CPATH="${WORKDIR}"/extra-headers
- fi
-
- if use qemu; then
- if use sdl; then
- sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
- tools/Makefile || die
- else
- sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
- tools/qemu-xen-traditional/xen-setup || die
- sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
- tools/Makefile || die
- fi
- else
- # Don't bother with qemu, only needed for fully virtualised guests
- sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
- fi
-
- # Reset bash completion dir; Bug 472438
- sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
- -i Config.mk || die
- sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
- # xencommons, Bug #492332, sed lighter weight than patching
- sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
- -i tools/hotplug/Linux/init.d/xencommons.in || die
-
- # fix bashishm
- sed -e '/Usage/s/\$//g' \
- -i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
- # respect multilib, usr/lib/libcacard.so.0.0.0
- sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
- -i tools/qemu-xen/configure || die
-
- #bug 518136, don't build 32bit exactuable for nomultilib profile
- if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
- sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
- fi
-
- # uncomment lines in xl.conf
- sed -e 's:^#autoballoon=:autoballoon=:' \
- -e 's:^#lockfile=:lockfile=:' \
- -e 's:^#vif.default.script=:vif.default.script=:' \
- -i tools/examples/xl.conf || die
-
- # disable capstone (Bug #673474)
- sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
- -i tools/Makefile || die
-
- # disable glusterfs
- sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
- -i tools/Makefile || die
-
- default
-}
-
-src_configure() {
- local myconf="--prefix=${PREFIX}/usr \
- --libdir=${PREFIX}/usr/$(get_libdir) \
- --libexecdir=${PREFIX}/usr/libexec \
- --localstatedir=${EPREFIX}/var \
- --disable-werror \
- --disable-xen \
- --enable-tools \
- --enable-docs \
- $(use_enable api xenapi) \
- $(use_enable ipxe) \
- $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
- $(use_enable ocaml ocamltools) \
- $(use_enable ovmf) \
- $(use_enable pam) \
- $(use_enable rombios) \
- --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
- "
-
- use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
- use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
- use amd64 && myconf+=" $(use_enable qemu-traditional)"
- tc-ld-disable-gold # Bug 669570
- econf ${myconf}
-}
-
-src_compile() {
- local myopt
- use debug && myopt="${myopt} debug=y"
- use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
-
- if test-flag-CC -fno-strict-overflow; then
- append-flags -fno-strict-overflow
- fi
-
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
- if use doc; then
- emake -C docs build
- else
- emake -C docs man-pages
- fi
-}
-
-src_install() {
- # Override auto-detection in the build system, bug #382573
- export INITD_DIR=/tmp/init.d
- export CONFIG_LEAF_DIR=../tmp/default
-
- # Let the build system compile installed Python modules.
- local PYTHONDONTWRITEBYTECODE
- export PYTHONDONTWRITEBYTECODE
-
- emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
- XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
- # Created at runtime
- rm -rv "${ED}/var/run" || die
-
- # Fix the remaining Python shebangs.
- python_fix_shebang "${D}"
-
- # Remove RedHat-specific stuff
- rm -rf "${D}"/tmp || die
-
- if use doc; then
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
- dodoc -r docs/{pdf,txt}
- else
- emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
- fi
- dodoc ${DOCS[@]}
-
- newconfd "${FILESDIR}"/xendomains.confd xendomains
- newconfd "${FILESDIR}"/xenstored.confd xenstored
- newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
- newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
- newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
- newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
- newinitd "${FILESDIR}"/xencommons.initd xencommons
- newconfd "${FILESDIR}"/xencommons.confd xencommons
- newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
- newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
- newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
- if use screen; then
- cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
- cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
- keepdir /var/log/xen-consoles
- fi
-
- # For -static-libs wrt Bug 384355
- if ! use static-libs; then
- rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
- fi
-
- # for xendomains
- keepdir /etc/xen/auto
-
- # Remove files failing QA AFTER emake installs them, avoiding seeking absent files
- find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
- -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
- keepdir /var/lib/xen/dump
- keepdir /var/lib/xen/xenpaging
- keepdir /var/lib/xenstored
- keepdir /var/log/xen
-
- if use python; then
- python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py"
- python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so"
- fi
-
- python_optimize
-}
-
-pkg_postinst() {
- elog "Official Xen Guide and the offical wiki page:"
- elog "https://wiki.gentoo.org/wiki/Xen"
- elog "https://wiki.xen.org/wiki/Main_Page"
- elog ""
- elog "Recommended to utilise the xencommons script to config system at boot"
- elog "Add by use of rc-update on completion of the install"
-
- if ! use hvm; then
- echo
- elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
- elog "support enable the hvm use flag."
- elog "An x86 or amd64 system is required to build HVM support."
- fi
-
- if use qemu; then
- elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
- elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
- elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
- elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
- fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.13.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.13.1-r2.ebuild
new file mode 100644
index 000000000000..e47034afe458
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.13.1-r2.ebuild
@@ -0,0 +1,505 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='ncurses,xml,threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+ inherit git-r3
+ REPO="xen.git"
+ EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+ S="${WORKDIR}/${REPO}"
+else
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ UPSTREAM_VER=1
+ SECURITY_VER=
+ # xen-tools's gentoo patches tarball
+ GENTOO_VER=21
+ # xen-tools's gentoo patches version which apply to this specific ebuild
+ GENTOO_GPV=0
+ # xen-tools ovmf's patches
+ OVMF_VER=
+
+ SEABIOS_VER="1.12.1"
+ EDK2_COMMIT="20d2e5a125e34fc8501026613a71549b2a1a3e54"
+ EDK2_OPENSSL_VERSION="1_1_1b"
+ EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+ IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6"
+
+ [[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+ [[ -n ${SECURITY_VER} ]] && \
+ SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+ [[ -n ${GENTOO_VER} ]] && \
+ GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+ [[ -n ${OVMF_VER} ]] && \
+ OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+ SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+ https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz
+ ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+ ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+ https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
+ https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
+ ${OVMF_PATCHSET_URI} )
+ ${UPSTREAM_PATCHSET_URI}
+ ${SECURITY_PATCHSET_URI}
+ ${GENTOO_PATCHSET_URI}"
+
+ S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README )
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ipxe? ( rombios )
+ ovmf? ( hvm )
+ pygrub? ( python )
+ rombios? ( hvm )
+ system-ipxe? ( rombios )
+ ?? ( ipxe system-ipxe )
+ ?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+ sys-apps/pciutils
+ dev-libs/lzo:2
+ dev-libs/glib:2
+ dev-libs/yajl
+ dev-libs/libaio
+ dev-libs/libgcrypt:0
+ sys-libs/zlib
+ ${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-4.11
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+ ')
+ x86? ( sys-devel/dev86
+ system-ipxe? ( sys-firmware/ipxe[qemu] )
+ sys-power/iasl )
+ api? ( dev-libs/libxml2
+ net-misc/curl )
+
+ ovmf? (
+ !arm? ( !arm64? ( dev-lang/nasm ) )
+ $(python_gen_impl_dep sqlite)
+ )
+ !amd64? ( >=sys-apps/dtc-1.4.0 )
+ amd64? ( sys-power/iasl
+ system-seabios? ( sys-firmware/seabios )
+ system-ipxe? ( sys-firmware/ipxe[qemu] )
+ rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+ dev-lang/perl
+ app-misc/pax-utils
+ doc? (
+ app-text/ghostscript-gpl
+ app-text/pandoc
+ $(python_gen_cond_dep '
+ dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+ ')
+ dev-texlive/texlive-latexextra
+ media-gfx/transfig
+ )
+ hvm? ( x11-base/xorg-proto )
+ qemu? (
+ app-arch/snappy:=
+ x11-libs/pixman
+ sdl? (
+ media-libs/libsdl[X]
+ media-libs/libsdl2[X]
+ )
+ )
+ system-qemu? ( app-emulation/qemu[xen] )
+ ocaml? ( dev-ml/findlib
+ >=dev-lang/ocaml-4 )
+ python? ( >=dev-lang/swig-4.0.0 )"
+
+RDEPEND="${COMMON_DEPEND}
+ sys-apps/iproute2[-minimal]
+ net-misc/bridge-utils
+ screen? (
+ app-misc/screen
+ app-admin/logrotate
+ )"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+ usr/libexec/xen/boot/hvmloader
+ usr/share/qemu-xen/qemu/hppa-firmware.img
+ usr/share/qemu-xen/qemu/s390-ccw.img
+ usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+ usr/libexec/xen/bin/elf2dmp
+ usr/libexec/xen/bin/ivshmem-client
+ usr/libexec/xen/bin/ivshmem-server
+ usr/libexec/xen/bin/qemu-edid
+ usr/libexec/xen/bin/qemu-img
+ usr/libexec/xen/bin/qemu-io
+ usr/libexec/xen/bin/qemu-keymap
+ usr/libexec/xen/bin/qemu-nbd
+ usr/libexec/xen/bin/qemu-pr-helper
+ usr/libexec/xen/bin/qemu-system-i386
+ usr/libexec/xen/bin/virtfs-proxy-helper
+ usr/libexec/xen/libexec/xen-bridge-helper
+ usr/share/qemu-xen/qemu/s390-ccw.img
+ usr/share/qemu-xen/qemu/s390-netboot.img
+ usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+ python_setup
+ export "CONFIG_LOMOUNT=y"
+
+ #bug 522642, disable compile tools/tests
+ export "CONFIG_TESTS=n"
+
+ if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+ if use x86 && use amd64; then
+ die "Confusion! Both x86 and amd64 are set in your use flags!"
+ elif use x86; then
+ export XEN_TARGET_ARCH="x86_32"
+ elif use amd64 ; then
+ export XEN_TARGET_ARCH="x86_64"
+ elif use arm; then
+ export XEN_TARGET_ARCH="arm32"
+ elif use arm64; then
+ export XEN_TARGET_ARCH="arm64"
+ else
+ die "Unsupported architecture!"
+ fi
+ fi
+}
+
+src_prepare() {
+ local i
+
+ # Upstream's patchset
+ if [[ -n ${UPSTREAM_VER} ]]; then
+ einfo "Try to apply Xen Upstream patch set"
+ eapply "${WORKDIR}"/patches-upstream
+ fi
+
+ # Security patchset
+ if [[ -n ${SECURITY_VER} ]]; then
+ einfo "Try to apply Xen Security patch set"
+ # apply main xen patches
+ # Two parallel systems, both work side by side
+ # Over time they may concdense into one. This will suffice for now
+ EPATCH_SUFFIX="patch"
+ EPATCH_FORCE="yes"
+
+ source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+ for i in ${XEN_SECURITY_MAIN}; do
+ eapply "${WORKDIR}"/patches-security/xen/$i
+ done
+
+ # apply qemu-xen/upstream patches
+ pushd "${S}"/tools/qemu-xen/ > /dev/null
+ for i in ${XEN_SECURITY_QEMUU}; do
+ eapply "${WORKDIR}"/patches-security/qemuu/$i
+ done
+ popd > /dev/null
+
+ # apply qemu-traditional patches
+ pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+ for i in ${XEN_SECURITY_QEMUT}; do
+ eapply "${WORKDIR}"/patches-security/qemut/$i
+ done
+ popd > /dev/null
+ fi
+
+ # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+ mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+ pushd tools/firmware/ > /dev/null
+ ln -s seabios-dir-remote seabios-dir || die
+ popd > /dev/null
+
+ # Gentoo's patchset
+ if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+ einfo "Try to apply Gentoo specific patch set"
+ source "${FILESDIR}"/gentoo-patches.conf || die
+ _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+ for i in ${!_gpv}; do
+ eapply "${WORKDIR}"/patches-gentoo/$i
+ done
+ fi
+
+ # Ovmf's patchset
+ if use ovmf; then
+ if [[ -n ${OVMF_VER} ]];then
+ einfo "Try to apply Ovmf patch set"
+ pushd "${WORKDIR}"/edk2-*/ > /dev/null
+ eapply "${WORKDIR}"/patches-ovmf
+ popd > /dev/null
+ fi
+ mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+ rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+ rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+ mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+ mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+ cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+ fi
+
+ # ipxe
+ if use ipxe; then
+ cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
+
+ # gcc 10
+ cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die
+ echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die
+ fi
+
+ mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+ # Fix texi2html build error with new texi2html, qemu.doc.html
+ sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+ use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+ sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+ -i tools/firmware/Makefile || die
+
+ # Drop .config, fixes to gcc-4.6
+ sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
+
+ # drop flags
+ unset CFLAGS
+ unset LDFLAGS
+ unset ASFLAGS
+ unset CPPFLAGS
+
+ if ! use pygrub; then
+ sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+ fi
+
+ if ! use python; then
+ sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+ fi
+
+ if ! use hvm; then
+ sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+ # Bug 351648
+ elif ! use x86 && ! has x86 $(get_all_abis); then
+ mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+ touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+ export CPATH="${WORKDIR}"/extra-headers
+ fi
+
+ if use qemu; then
+ if use sdl; then
+ sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+ tools/Makefile || die
+ else
+ sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+ tools/qemu-xen-traditional/xen-setup || die
+ sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+ tools/Makefile || die
+ fi
+ else
+ # Don't bother with qemu, only needed for fully virtualised guests
+ sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
+ fi
+
+ # Reset bash completion dir; Bug 472438
+ sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+ -i Config.mk || die
+ sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+ # xencommons, Bug #492332, sed lighter weight than patching
+ sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+ -i tools/hotplug/Linux/init.d/xencommons.in || die
+
+ # fix bashishm
+ sed -e '/Usage/s/\$//g' \
+ -i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+ # respect multilib, usr/lib/libcacard.so.0.0.0
+ sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+ -i tools/qemu-xen/configure || die
+
+ #bug 518136, don't build 32bit exactuable for nomultilib profile
+ if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+ sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+ fi
+
+ # uncomment lines in xl.conf
+ sed -e 's:^#autoballoon=:autoballoon=:' \
+ -e 's:^#lockfile=:lockfile=:' \
+ -e 's:^#vif.default.script=:vif.default.script=:' \
+ -i tools/examples/xl.conf || die
+
+ # disable capstone (Bug #673474)
+ sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+ -i tools/Makefile || die
+
+ # disable glusterfs
+ sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+ -i tools/Makefile || die
+
+ default
+}
+
+src_configure() {
+ local myconf="--prefix=${PREFIX}/usr \
+ --libdir=${PREFIX}/usr/$(get_libdir) \
+ --libexecdir=${PREFIX}/usr/libexec \
+ --localstatedir=${EPREFIX}/var \
+ --disable-werror \
+ --disable-xen \
+ --enable-tools \
+ --enable-docs \
+ $(use_enable api xenapi) \
+ $(use_enable ipxe) \
+ $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
+ $(use_enable ocaml ocamltools) \
+ $(use_enable ovmf) \
+ $(use_enable pam) \
+ $(use_enable rombios) \
+ --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+ "
+
+ use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+ use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+ use amd64 && myconf+=" $(use_enable qemu-traditional)"
+ tc-ld-disable-gold # Bug 669570
+ econf ${myconf}
+}
+
+src_compile() {
+ local myopt
+ use debug && myopt="${myopt} debug=y"
+ use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
+
+ if test-flag-CC -fno-strict-overflow; then
+ append-flags -fno-strict-overflow
+ fi
+
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+ if use doc; then
+ emake -C docs build
+ else
+ emake -C docs man-pages
+ fi
+}
+
+src_install() {
+ # Override auto-detection in the build system, bug #382573
+ export INITD_DIR=/tmp/init.d
+ export CONFIG_LEAF_DIR=../tmp/default
+
+ # Let the build system compile installed Python modules.
+ local PYTHONDONTWRITEBYTECODE
+ export PYTHONDONTWRITEBYTECODE
+
+ emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+ XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+ # Created at runtime
+ rm -rv "${ED}/var/run" || die
+
+ # Fix the remaining Python shebangs.
+ python_fix_shebang "${D}"
+
+ # Remove RedHat-specific stuff
+ rm -rf "${D}"/tmp || die
+
+ if use doc; then
+ emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+ dodoc -r docs/{pdf,txt}
+ else
+ emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+ fi
+ dodoc ${DOCS[@]}
+
+ newconfd "${FILESDIR}"/xendomains.confd xendomains
+ newconfd "${FILESDIR}"/xenstored.confd xenstored
+ newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+ newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+ newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+ newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+ newinitd "${FILESDIR}"/xencommons.initd xencommons
+ newconfd "${FILESDIR}"/xencommons.confd xencommons
+ newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+ newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+ newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+ if use screen; then
+ cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+ cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+ keepdir /var/log/xen-consoles
+ fi
+
+ # For -static-libs wrt Bug 384355
+ if ! use static-libs; then
+ rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
+ fi
+
+ # for xendomains
+ keepdir /etc/xen/auto
+
+ # Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+ find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+ -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+ keepdir /var/lib/xen/dump
+ keepdir /var/lib/xen/xenpaging
+ keepdir /var/lib/xenstored
+ keepdir /var/log/xen
+
+ if use python; then
+ python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py"
+ python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so"
+ fi
+
+ python_optimize
+}
+
+pkg_postinst() {
+ elog "Official Xen Guide and the offical wiki page:"
+ elog "https://wiki.gentoo.org/wiki/Xen"
+ elog "https://wiki.xen.org/wiki/Main_Page"
+ elog ""
+ elog "Recommended to utilise the xencommons script to config system at boot"
+ elog "Add by use of rc-update on completion of the install"
+
+ if ! use hvm; then
+ echo
+ elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+ elog "support enable the hvm use flag."
+ elog "An x86 or amd64 system is required to build HVM support."
+ fi
+
+ if use qemu; then
+ elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+ elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
+ elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
+ elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+ fi
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 937068f7c953..d0ebf0a8aa6f 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,11 +1,13 @@
AUX xen-4.11-efi.patch 1971 BLAKE2B b24f9315cff7f2de2a945088363429b9f4dd7a4101d3f1c0d4bf9733189808f5e1c47f1d90d1784f17fa52ca1626972c81d20c5e1ee3d42d082cdefcf67eb8dc SHA512 17208dc107f4ae4c5ec226c2ac05126817134fb6084cd8923204dc1b014e645e12c34cd11296319127e595ccbf17747931e9df78218bf49814f66e3cc6a789fd
AUX xen-4.14-efi.patch 1969 BLAKE2B dec62e9b04ce23025443caa68df2fd69c50a3fdf650bf26047b28f3a72d1aa58124127274cd2c1373a4e133784b2691145c49c9a182bd635aa9c60bb1e45a0c1 SHA512 3e32aac5ba2ec371a3877d64532e8d134c3b4fe3a6644477ee8ecf56cbb8378b20f9d5d7415bec891d96910550a787848779c82ee4b9d57046f4c13235531ea0
DIST xen-4.12.3-upstream-patches-0.tar.xz 7236 BLAKE2B d795e2be6f1edb31f1d794912328c4d3673eb800464d99c5ae867d189d0ea2b4cbac0c8bcda7790ae40742f6bf79308eb624b4f67d1c7f12cc64be6d8c920b84 SHA512 de5723d4fd547845ca9a876f8535e720f7bd790e48dbf1d92397d60a285ef88a31cad276b1a01a4fa8946cefb15d69c8a3a00da5113b6e5e2655b871be076adf
+DIST xen-4.12.3-upstream-patches-1.tar.xz 39052 BLAKE2B dbe18a8d67009be9597ea8f0cd45850ed0e437119095c414796efff2810e884a3d7c062a7e5e12e93d8991cbbab50c0095d7ae1c937129f8f9490aa5f31ca6f8 SHA512 1383b1c0e3d4918b6b43c9cdff5284e259385136aad479814ea1d50b25017a0466a6a0044321585f38f4c8fb30f5af91a45f666a6d7fce6e60a4dfdb346a421b
DIST xen-4.12.3.tar.gz 26985230 BLAKE2B 403de519a552f1cd49e5a85b63f48df1b7a47ff8381385860b67df32af0b33be1c13c92ca2234e4479b7f415e711e0f46c396c3f62dfb5b2465d2991723cf6ef SHA512 7bbf4e752477f18143ac9a62fb633b1fbe115a1a9b03d0132f33dfca025bc9b76d9c2e9b66a3e407d14aff161b940b1a82e3e3ca43213798e9dd38b6970194e0
-DIST xen-4.13.1-upstream-patches-0.tar.xz 7156 BLAKE2B 246b30cd8bc0ee8853a4e85ae0140d0ae52e69f3e4220bd97af8564491cf8285a7a592cd1392467a30acf6947733c8af355c110a44cb565927fb4f0bb7867113 SHA512 9059de696cb984c1891b5a87d1832562aa34b6568a21867c6744b603180f2b628905c81031f3c7c24867122d07432906750e0cfc6ca2fdacd31b82d35488455f
+DIST xen-4.13.1-upstream-patches-1.tar.xz 46892 BLAKE2B 8ccfe1d6b3589e262fa04526d5238694e324fef3b514daebdffcb74cecfc2700e37f810faf868ec198c99ed3a9af2c351656c31798c5791bfd6816552d78fd7a SHA512 2d9708c4b558c5986afd1caea56f69ac8b11d69371fd4afae0e9c3480a0b863c99ebe2d3b857d623d41924437db7f7e44fefc7bae892cd05d7605243ae8140d5
DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95 SHA512 b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90
DIST xen-4.14.0-rc3.tar.gz 39943460 BLAKE2B 12356947738cfc7b43d0fa1bcbc8912f87fa5f0368b02b2bd8cc1d2681edc2f26d8edce50991e5fab65aa40f32ce263a2ded80f8ae827f182ea5a0f63274ddc2 SHA512 c6771003f2f66334c9181faeb01cb3283fcbfda78064cfde3a14ae9dca2454c35766d78df23dc480a9daba1edb7fd31db9ebfc3a4f57dd2b07852dd486e859ed
EBUILD xen-4.12.3-r1.ebuild 4438 BLAKE2B 19b7c8084893bbe6541dc3fcfabbbf6c2f940a0153bb310c23fb66624dc7b5e8ab4108847f5d68879766adae727df6f1a2373ef39f3f080e8f99c093ed20dd6d SHA512 ba04b747df09c27dc0d99ed2b9b585c00eb0da1b6537d0022c3c542f7a4a1febaeda8ea2d11a960075ec53620679c4543f5f924f8af62e0b1d6050362c09b60a
-EBUILD xen-4.13.1-r1.ebuild 4445 BLAKE2B 8b289338889c90f355c4a8e87d851394a7148606ea4443f026fc02a174ad8d73f44f291b68427cd1427d54509b8615918435271edec126a7a89267d28cc874bb SHA512 03169328b982de9905dd3e9e6099b6b1bb78b23ec8c00a12e99c2d7fd39abf005f5e9278817d3c567a1a9dd2442e3f00b443188d4158121f2913704a93f51585
+EBUILD xen-4.12.3-r2.ebuild 4439 BLAKE2B f6f75aecc3d0aa8316bcdbe4390f3cb1d4e7f84b06ed885ffa35db4d2429f02e3da9b4a2c4e514cfe1588a2559cdcd41ccdae8ae256d56439214d7cbebc2aed0 SHA512 bf542eb66c38f9d4e2f7a010f044b8ccbad0f6b86ce66c3feaf7dabd335149fc759eca5fe8cda717d381ee9b24b47df6ae76970b2adcb12d7d6d224d5a7d7a53
+EBUILD xen-4.13.1-r2.ebuild 4445 BLAKE2B 54482c3f99661ed734c6116ea1580a80311304fb5177f843212299e357c8ad2e40353779b9a5d85e9d3844f0b2d4841c969720e1a9b0a625365ca8a14c683ce8 SHA512 70f260a78af31c719f8752eb1f51cc50ced0006a4ce5b0b0781eda69833b6981a038aef545fe5c1e018a0a4a39a3df52c6eb09c332237847cf9b8e3d080f22bb
EBUILD xen-4.14.0_rc3.ebuild 4457 BLAKE2B 69ce574c00d0f6b60746619ddb18236ce21a637e94807957e43550a9529a67ff094ea70d311743a5af445225c59b38b1dabb0416d56b3fa784618405847d362c SHA512 f44a41e679e5d63b3b1eadb29cde9bd17e3706ee99f561b67bb90333c0b49735ff01c64ae964c10e03f61567e67173eb697e0772e0ec4b8c99158aba741d2ba2
MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248
diff --git a/app-emulation/xen/xen-4.12.3-r2.ebuild b/app-emulation/xen/xen-4.12.3-r2.ebuild
new file mode 100644
index 000000000000..808328a1a50a
--- /dev/null
+++ b/app-emulation/xen/xen-4.12.3-r2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+ SRC_URI=""
+else
+ KEYWORDS="~amd64 ~arm -x86"
+ UPSTREAM_VER=1
+ SECURITY_VER=
+ GENTOO_VER=
+
+ [[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+ [[ -n ${SECURITY_VER} ]] && \
+ SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+ [[ -n ${GENTOO_VER} ]] && \
+ GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+ SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+ ${UPSTREAM_PATCHSET_URI}
+ ${SECURITY_PATCHSET_URI}
+ ${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+ efi? ( >=sys-devel/binutils-2.22[multitarget] )
+ !efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ if [[ -z ${XEN_TARGET_ARCH} ]]; then
+ if use amd64; then
+ export XEN_TARGET_ARCH="x86_64"
+ elif use arm; then
+ export XEN_TARGET_ARCH="arm32"
+ elif use arm64; then
+ export XEN_TARGET_ARCH="arm64"
+ else
+ die "Unsupported architecture!"
+ fi
+ fi
+
+ if use flask ; then
+ export "XSM_ENABLE=y"
+ export "FLASK_ENABLE=y"
+ fi
+}
+
+src_prepare() {
+ # Upstream's patchset
+ [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+ # Security patchset
+ if [[ -n ${SECURITY_VER} ]]; then
+ einfo "Try to apply Xen Security patch set"
+ # apply main xen patches
+ # Two parallel systems, both work side by side
+ # Over time they may concdense into one. This will suffice for now
+ source "${WORKDIR}"/patches-security/${PV}.conf
+
+ local i
+ for i in ${XEN_SECURITY_MAIN}; do
+ eapply "${WORKDIR}"/patches-security/xen/$i
+ done
+ fi
+
+ # Gentoo's patchset
+ [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+ eapply "${FILESDIR}"/${PN}-4.11-efi.patch
+
+ # Drop .config
+ sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
+
+ if use efi; then
+ export EFI_VENDOR="gentoo"
+ export EFI_MOUNTPOINT="/boot"
+ fi
+
+ default
+}
+
+src_configure() {
+ use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+ use debug && myopt="${myopt} debug=y"
+
+ # remove flags
+ unset CFLAGS
+ unset LDFLAGS
+ unset ASFLAGS
+
+ tc-ld-disable-gold # Bug 700374
+}
+
+src_compile() {
+ # Send raw LDFLAGS so that --as-needed works
+ emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+ local myopt
+ use debug && myopt="${myopt} debug=y"
+
+ # The 'make install' doesn't 'mkdir -p' the subdirs
+ if use efi; then
+ mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+ fi
+
+ emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+ # make install likes to throw in some extra EFI bits if it built
+ use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+ elog "Official Xen Guide:"
+ elog " https://wiki.gentoo.org/wiki/Xen"
+
+ use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+ elog "You can optionally block the installation of /boot/xen-syms by an entry"
+ elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+ elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+
+ ewarn
+ ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+ ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+ ewarn "to work fine."
+ ewarn
+ ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+ ewarn
+ ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}
diff --git a/app-emulation/xen/xen-4.13.1-r1.ebuild b/app-emulation/xen/xen-4.13.1-r1.ebuild
deleted file mode 100644
index 6b80dc379297..000000000000
--- a/app-emulation/xen/xen-4.13.1-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ $PV == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
- SRC_URI=""
-else
- KEYWORDS="~amd64 ~arm -x86"
- UPSTREAM_VER=0
- SECURITY_VER=
- GENTOO_VER=
-
- [[ -n ${UPSTREAM_VER} ]] && \
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
- [[ -n ${SECURITY_VER} ]] && \
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
- [[ -n ${GENTOO_VER} ]] && \
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
- SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
- ${UPSTREAM_PATCHSET_URI}
- ${SECURITY_PATCHSET_URI}
- ${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
- efi? ( >=sys-devel/binutils-2.22[multitarget] )
- !efi? ( >=sys-devel/binutils-2.22 )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- python-any-r1_pkg_setup
- if [[ -z ${XEN_TARGET_ARCH} ]]; then
- if use amd64; then
- export XEN_TARGET_ARCH="x86_64"
- elif use arm; then
- export XEN_TARGET_ARCH="arm32"
- elif use arm64; then
- export XEN_TARGET_ARCH="arm64"
- else
- die "Unsupported architecture!"
- fi
- fi
-
- if use flask ; then
- export "XSM_ENABLE=y"
- export "FLASK_ENABLE=y"
- fi
-}
-
-src_prepare() {
- # Upstream's patchset
- [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
-
- # Security patchset
- if [[ -n ${SECURITY_VER} ]]; then
- einfo "Try to apply Xen Security patch set"
- # apply main xen patches
- # Two parallel systems, both work side by side
- # Over time they may concdense into one. This will suffice for now
- source "${WORKDIR}"/patches-security/${PV}.conf
-
- local i
- for i in ${XEN_SECURITY_MAIN}; do
- eapply "${WORKDIR}"/patches-security/xen/$i
- done
- fi
-
- # Gentoo's patchset
- [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
-
- eapply "${FILESDIR}"/${PN}-4.11-efi.patch
-
- # Drop .config
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
-
- if use efi; then
- export EFI_VENDOR="gentoo"
- export EFI_MOUNTPOINT="/boot"
- fi
-
- default
-}
-
-src_configure() {
- use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
- use debug && myopt="${myopt} debug=y"
-
- # remove flags
- unset CFLAGS
- unset LDFLAGS
- unset ASFLAGS
-
- tc-ld-disable-gold # Bug 700374
-}
-
-src_compile() {
- # Send raw LDFLAGS so that --as-needed works
- emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
- local myopt
- use debug && myopt="${myopt} debug=y"
-
- # The 'make install' doesn't 'mkdir -p' the subdirs
- if use efi; then
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
- fi
-
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-
- # make install likes to throw in some extra EFI bits if it built
- use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
- elog "Official Xen Guide:"
- elog " https://wiki.gentoo.org/wiki/Xen"
-
- use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
-
- elog "You can optionally block the installation of /boot/xen-syms by an entry"
- elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
- elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-
- ewarn
- ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
- ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
- ewarn "to work fine."
- ewarn
- ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
- ewarn
- ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
-}
diff --git a/app-emulation/xen/xen-4.13.1-r2.ebuild b/app-emulation/xen/xen-4.13.1-r2.ebuild
new file mode 100644
index 000000000000..f9c3acf98258
--- /dev/null
+++ b/app-emulation/xen/xen-4.13.1-r2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+ SRC_URI=""
+else
+ KEYWORDS="~amd64 ~arm -x86"
+ UPSTREAM_VER=1
+ SECURITY_VER=
+ GENTOO_VER=
+
+ [[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+ [[ -n ${SECURITY_VER} ]] && \
+ SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+ [[ -n ${GENTOO_VER} ]] && \
+ GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+ SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+ ${UPSTREAM_PATCHSET_URI}
+ ${SECURITY_PATCHSET_URI}
+ ${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+ efi? ( >=sys-devel/binutils-2.22[multitarget] )
+ !efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ if [[ -z ${XEN_TARGET_ARCH} ]]; then
+ if use amd64; then
+ export XEN_TARGET_ARCH="x86_64"
+ elif use arm; then
+ export XEN_TARGET_ARCH="arm32"
+ elif use arm64; then
+ export XEN_TARGET_ARCH="arm64"
+ else
+ die "Unsupported architecture!"
+ fi
+ fi
+
+ if use flask ; then
+ export "XSM_ENABLE=y"
+ export "FLASK_ENABLE=y"
+ fi
+}
+
+src_prepare() {
+ # Upstream's patchset
+ [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+ # Security patchset
+ if [[ -n ${SECURITY_VER} ]]; then
+ einfo "Try to apply Xen Security patch set"
+ # apply main xen patches
+ # Two parallel systems, both work side by side
+ # Over time they may concdense into one. This will suffice for now
+ source "${WORKDIR}"/patches-security/${PV}.conf
+
+ local i
+ for i in ${XEN_SECURITY_MAIN}; do
+ eapply "${WORKDIR}"/patches-security/xen/$i
+ done
+ fi
+
+ # Gentoo's patchset
+ [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+ eapply "${FILESDIR}"/${PN}-4.11-efi.patch
+
+ # Drop .config
+ sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
+
+ if use efi; then
+ export EFI_VENDOR="gentoo"
+ export EFI_MOUNTPOINT="/boot"
+ fi
+
+ default
+}
+
+src_configure() {
+ use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+ use debug && myopt="${myopt} debug=y"
+
+ # remove flags
+ unset CFLAGS
+ unset LDFLAGS
+ unset ASFLAGS
+
+ tc-ld-disable-gold # Bug 700374
+}
+
+src_compile() {
+ # Send raw LDFLAGS so that --as-needed works
+ emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+ local myopt
+ use debug && myopt="${myopt} debug=y"
+
+ # The 'make install' doesn't 'mkdir -p' the subdirs
+ if use efi; then
+ mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+ fi
+
+ emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+ # make install likes to throw in some extra EFI bits if it built
+ use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+ elog "Official Xen Guide:"
+ elog " https://wiki.gentoo.org/wiki/Xen"
+
+ use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+ elog "You can optionally block the installation of /boot/xen-syms by an entry"
+ elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+ elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+
+ ewarn
+ ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+ ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+ ewarn "to work fine."
+ ewarn
+ ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+ ewarn
+ ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index af0a0499fa0d..d87078dcd23f 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-timidity/Manifest b/app-eselect/eselect-timidity/Manifest
index ad0a525b3407..9d90509b4f9b 100644
--- a/app-eselect/eselect-timidity/Manifest
+++ b/app-eselect/eselect-timidity/Manifest
@@ -1,3 +1,3 @@
DIST timidity.eselect-20110513.bz2 1689 BLAKE2B 80d99984f3407a8130969626e12212f4c62f1587ef3ed4a0b953d480286f87fa32c57cf84a5794d8effef4690bdfc1d8b7c9c0031919b61ba4e123544bd2df5f SHA512 9af37f195dde3595cb55e3ca467928fd04b5f755545cf41ce0b3198a21107ad35e28365c1d310a77561f8ffcb1b10909b618fbdc55ca06b77492711b48c17afe
-EBUILD eselect-timidity-20110513.ebuild 534 BLAKE2B 1c1464816b127a3fff594d67c6409e7c5db3f6922d0a97e4f79fecdf99fbd6f31456c192501a829f1a07997abb878df94e6b83c6ddffd28a6ec495a3f6baca3f SHA512 025e4ab4e745a4fc1fed93285247f4aff30592867ef83c1ff979968dc5afe243421d65deb4fdee2cfdeccfb3f9d004355a573c307b430de5188975d525c51cab
+EBUILD eselect-timidity-20110513.ebuild 533 BLAKE2B 2faa6d76714f7de686d779612eb76962a3907687152d94788432e4ea4e67711ae529e6343bbf29ddf1b29e0d62ec7950ad4c93dd4dacde9ee4eaf15e2d83c4c1 SHA512 ce201454bdf8aaf3e13197dae0d0e8de4b0596e89383345f5d821605eddb74971e723b3dcf6ca32fefe435dbbbdc91502b4175c816f8209dc28561092147b843
MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild b/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
index 20346b6264bc..bf5e371cf9fc 100644
--- a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
+++ b/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/timidity.eselect-${PVR}.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
RDEPEND=">=app-admin/eselect-1.2.3"
S="${WORKDIR}"
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 05f23f14efac..bcf439eeb06f 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/mysqld_exporter/Manifest b/app-metrics/mysqld_exporter/Manifest
index 08e7685abe85..0da2240c18c8 100644
--- a/app-metrics/mysqld_exporter/Manifest
+++ b/app-metrics/mysqld_exporter/Manifest
@@ -8,5 +8,5 @@ DIST mysqld_exporter-0.11.0.tar.gz 1393809 BLAKE2B ac6b04d2ad24f1c083c411f10bbb6
DIST mysqld_exporter-0.12.1_p20200622.tar.gz 1640334 BLAKE2B fa52fd7474af548bc9429026d7c92bc543cff7f2e2f5e17007a52adc647d6d022a4ec9d099376cc469b4fdc8bab285e0e699a1b10938fc6b7a6704dcc1466a50 SHA512 ccac9a718214c9ab82362deeb81949cecaa6c2fc6567ef7e3d099ca2dbf8385cb9c498837e41ad0bcdf5ec2c9d82fd159792245b97e53c182a30917e80a20cf1
EBUILD mysqld_exporter-0.10.0-r1.ebuild 1586 BLAKE2B 0920fe22a1505ec3e4d5efbd63e24cf619a0eb005ca64e9d1e398f8a06ab7a9afd56956a3e5aa3bae42d5ac3170d8494f3668bacab6a38cb3a83b6b949a2b56a SHA512 f4bcc367fcf0684d6633797bac733be320b97a800129a97d811e5e7eea4f110122a2b918d360b15077e30178a55e90956b142c59a8e14a8dfe76cda3d0655cda
EBUILD mysqld_exporter-0.11.0.ebuild 1927 BLAKE2B a6b49e427c3cdf45f7f66711727e6cd9dd3dca74eac76c7642b1634e5073665491136780d95f0bbe5ae8f6157fac32f36e94fba96c83392b277c9ca294b23ceb SHA512 95e0986b93a4ace49574b95f5e62299080747c02ccee6aff8f18a2ae1070e7bf1cb7640fe380759de45390a0f2d7b0b786ef64f7c010ca07b12262f640965e54
-EBUILD mysqld_exporter-0.12.1_p20200622.ebuild 2072 BLAKE2B eee2a79b582fa74a4639e0a26908ff58498891b95de97d7532843b9e05fc78116d349f6343d5b9cb00ffb5fec804748cdda4844b0b910fb81dbbe1e10699dc50 SHA512 a1089e3bf7d7df840c594e494e4040c7b66b38eb06b1feb2f038aa0b8e33bd0673aa244542119d5af436585c9f8776814b5562917bc30e8f05393f989c7fe0aa
+EBUILD mysqld_exporter-0.12.1_p20200622.ebuild 2070 BLAKE2B 83dd4d2a98364c49a7857dfb52e5268227cd16f03c947db5f1a26aba17134edafd788ab00b5d0a2d9c4ca696a5e80d30b8282c333f483a4166f02b107567f1a7 SHA512 fb65fd1f3b1109f47e8877dfe2a15ee3649439c2e17473497befb5aee1cf55901a4333ed262eef18d9564b016753e916f7355c7361ad0c55d1e48b9fb9da8395
MISC metadata.xml 342 BLAKE2B c99db8a7ba47d8b948f5e8623c98ff234a67d14485a09a412d55155b878fe2cff4594934f2e1aef749072f4f52ca8c0b660e52764cc20b40aedc3ae2280d8fdd SHA512 55dcb15bda103364487e98359157961d7859af7e38cef4030e53fe2fb50ded0e34d27a1607171e62d60dd53e93b2cd1f30becded706dcb362ce3f45052cd0203
diff --git a/app-metrics/mysqld_exporter/mysqld_exporter-0.12.1_p20200622.ebuild b/app-metrics/mysqld_exporter/mysqld_exporter-0.12.1_p20200622.ebuild
index 5ba0eed69959..03752da0489d 100644
--- a/app-metrics/mysqld_exporter/mysqld_exporter-0.12.1_p20200622.ebuild
+++ b/app-metrics/mysqld_exporter/mysqld_exporter-0.12.1_p20200622.ebuild
@@ -63,7 +63,7 @@ src_install() {
pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
# This is a new installation
- elog "Create \"${EROOT%/}/var/lib/mysqld_exporter/.my.cnf\" to read MySQL credentials from file."
+ elog "Create \"${EROOT}/var/lib/mysqld_exporter/.my.cnf\" to read MySQL credentials from file."
else
local _replacing_version=
for _replacing_version in ${REPLACING_VERSIONS}; do
diff --git a/app-metrics/prom2json/Manifest b/app-metrics/prom2json/Manifest
index 3397969471b8..e184a3011da8 100644
--- a/app-metrics/prom2json/Manifest
+++ b/app-metrics/prom2json/Manifest
@@ -1,3 +1,5 @@
DIST prom2json-0.1.0_p20170523.tar.gz 129179 BLAKE2B ef0e42e340d53894c31bff7018b668d8575fc3568584a43dc308955665ac6f59dbabf2d4605bc2a66957df57a29ebb7b3a4eef1f99537eefc2805a5ffd86904f SHA512 824f4c43f4a167dc7dde2f11e84cf482e5cdfa26ab11caf08a5461d525543c3491180f54694c4ae61fdd5dc9763ff16f6e29b332a64dc3ac52fdb7b9c0902571
+DIST prom2json-1.3.0.tar.gz 1646893 BLAKE2B 9b8fcfa4a3e45ee08a57016fa6a7611604cbb578f162f0bf7ff8338f345f98788b75c3ac047ffca95b62020e972c302bc1c44f2f7f00240cfd978f73b8d9c829 SHA512 8f02c7b2616d915e2b4ff5f195a8c2eff89d18417f7396dc02d2aa4cf34711358b0beef6effae9b42a3d6f4b0616c5d3ab995a73ab9e37a4a0ec230adff6f249
EBUILD prom2json-0.1.0_p20170523.ebuild 921 BLAKE2B 8c4c359398fd7941f127c2fec6f8a0306f53dee43d2948873ffffe840b27f35ce2753c787f2bdfc6445ef9371fa10b4edc36dc3c2565e358ee7f9c8fe868b6ad SHA512 85ba4728a68ea42bc69f196e0e027f38ece006b9af5b2c9fe2da30b2605f79dc568017132e2eaa116b109bc7f18109581c8d69df641f82c7ce0066ea5dd9d3f2
-MISC metadata.xml 252 BLAKE2B ba7b5183b5a1685794845e1070f0024be5bdd6e73f2727a3f905189d68851416ee0ce6a2d481da059964761cfa256581c75b5d96fd36455bb56cc0f7be4cc85a SHA512 2d90bda7f93668f2b160b8bc41c11aa0d5a9aed5c195534c691aa221500cfd27097c5180001a59be5b4d8a28fd4244d64966ee1a918806589d18e8b3c428d248
+EBUILD prom2json-1.3.0.ebuild 749 BLAKE2B 0df29cf7eba0fbb1167dd9b2ebd5d9a46662242984a7c4056fd17c35f47c2a0158f0dc0ade186c9f37cb7d0005dfab07dffdf6efb6c92ec65c492361546f1bad SHA512 a196312a48c7e224b9a07dd4a7d5baef11e39b40f95d53f30b8548497c2bf13d4761a22f7567d593d14afd7486b5e0a3c8d64cc97c18af1611245d85a1e45448
+MISC metadata.xml 337 BLAKE2B 5db6323f6d84dfdb7e5d9faa9e874af05ed0bb90d5e23960cc40a566ec27be4ffee93a4fa59b7787b03c2cfd1c20870266acc10bd1b305ce85590103345ea9fb SHA512 d00eade6a00047fd4cadc6ff130d46a1f741ba72345a24ee52b7ce0608ca437086e8caa6b35bb04081bf7e1e3b298ade168e86d3775fd784c8d8539b077a2bfe
diff --git a/app-metrics/prom2json/metadata.xml b/app-metrics/prom2json/metadata.xml
index a4d942c42b71..0900b932fe15 100644
--- a/app-metrics/prom2json/metadata.xml
+++ b/app-metrics/prom2json/metadata.xml
@@ -1,7 +1,10 @@
-
+
+ williamh@gentoo.org
+ William Hubbs
+
prometheus/prom2json
diff --git a/app-metrics/prom2json/prom2json-1.3.0.ebuild b/app-metrics/prom2json/prom2json-1.3.0.ebuild
new file mode 100644
index 000000000000..d90427c7afa8
--- /dev/null
+++ b/app-metrics/prom2json/prom2json-1.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+GIT_COMMIT=9180c89ee65bde2cbbe799d06d7d09e30f629984
+
+DESCRIPTION="A tool to scrape a Prometheus client and dump the result as JSON"
+HOMEPAGE="https://github.com/prometheus/prom2json"
+SRC_URI="https://github.com/prometheus/prom2json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64"
+
+BDEPEND="dev-util/promu"
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s/{{.Revision}}/${GIT_COMMIT}/" \
+ -e "s/{{.Version}}/${PV}/" \
+ .promu.yml || die
+}
+
+src_compile() {
+ mkdir bin || die
+ promu build --prefix bin || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc {README,CONTRIBUTING}.md
+}
diff --git a/app-metrics/pushgateway/Manifest b/app-metrics/pushgateway/Manifest
index 47d7d0a32c5a..ca589a97c28c 100644
--- a/app-metrics/pushgateway/Manifest
+++ b/app-metrics/pushgateway/Manifest
@@ -7,5 +7,5 @@ DIST pushgateway-0.9.1.tar.gz 4743766 BLAKE2B d0c605d562b64782c6a90e82efcfbb3866
DIST pushgateway-1.0.0.tar.gz 4780753 BLAKE2B 76dc24a6130809d6f838cc6ab08ab522d8a381526688b072277e31eb6ff4fccf63bcf4317512918bf194b0b409b4f52d76d2f88fdf4297c22567420ed24660a9 SHA512 0662b3caefa053c8478b3c3fcaba3298ad69d7f7f195acc3b5b932d1f2004cd3df0276156650b0a6022dc529b4b53c2ee4d33f510937c98a1ca4c95e1c087581
EBUILD pushgateway-0.10.0.ebuild 1387 BLAKE2B df2eeeecc945598417c4ca9c026bb3cabb4103371ee5bd7b7b4ceb27d193daea8b96b26d270f32893ce7ee351df6d2c5b70ccb92c808f357331a8d47427e3c94 SHA512 2a2fa16afa81774a05ffc9311435d7631bf373cfafc1be20e44b633ce1bb3c48e651e99542adba53dc5c09c2f2121c9b38ead473c8fec9696245cb3a6ed66156
EBUILD pushgateway-0.9.1.ebuild 1387 BLAKE2B a3b8be581efdf617ed04265be0bfe6e871a9758f2a891d26515c04b595dc1ed3f51bea584bb3ffd40bb29dc12371e9c7712e0666f0ceb34aabdaccf2e501f103 SHA512 6825836daf611ea929c03c93d43565f7300b16593daab81f19afd7b1c9e173f194ed582434a48170423c008ee821e32bc508a146f598b225b03cd0d02d9eb7f0
-EBUILD pushgateway-1.0.0.ebuild 1387 BLAKE2B 5d0e705c5f5c4b2a47543d62b96ea1ca1ad03d12136b7e0044321979e798169c68f6ebe7b239daf3731f39d3db0d97174e1c5743791e9357e851dd155604475c SHA512 a68fc494b5fb936f5748b518b722179992626b12cd0f43e7d097cdb73dea2d29f3114f629273132e812f6a3ecb73f99f5b8b2ff3fdd0fd7ac17640c1e33ffa97
+EBUILD pushgateway-1.0.0.ebuild 1121 BLAKE2B faae0192aa45ef8b9c680956e7a17c65c82fe340277a7f5f1f474ab9d351ccac611877080bb86b8720968fb7dfe58ec85d32a4f5f20e414f70e9d7456f181f56 SHA512 1d49364135c78810473914317c0226ee2f8732e0d31be54f2bd78019bc7d461b22d7cbd2918cd7a6a3a0ca5c9afee0fb249e048829c00a2bdcb67a8670dd1b23
MISC metadata.xml 331 BLAKE2B 4b07a7e72e94f5a764207f0e59f1a6e8f578b83f761f2cf658ef3a554e6d3fab9725445b6a2a8adc2de990f4a156c14ae9c5d10632f28ab53d995ce4ffc86ba5 SHA512 7d59c6fdec106a6708a76e44714ff47a947fe2b85839c96dafb2768733bbeb37d04a3d936ee8f371f432055f49f54fc904ac1a214fa96da6d4a961a6fb81d599
diff --git a/app-metrics/pushgateway/pushgateway-1.0.0.ebuild b/app-metrics/pushgateway/pushgateway-1.0.0.ebuild
index 7a19aeed4f08..2cc3feddfe7c 100644
--- a/app-metrics/pushgateway/pushgateway-1.0.0.ebuild
+++ b/app-metrics/pushgateway/pushgateway-1.0.0.ebuild
@@ -2,23 +2,21 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit user golang-build golang-vcs-snapshot systemd
+inherit go-module user systemd
-EGO_PN="github.com/prometheus/pushgateway"
EGIT_COMMIT="v${PV/_rc/-rc.}"
GIT_COMMIT="cc61f46"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
HOMEPAGE="https://github.com/prometheus/pushgateway"
-SRC_URI="${ARCHIVE_URI}"
+SRC_URI="https://github.com/prometheus/pushgateway/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
+KEYWORDS="~amd64"
IUSE=""
-DEPEND=">=dev-lang/go-1.12
- >=dev-util/promu-0.3.0"
+BDEPEND=">=dev-util/promu-0.3.0"
pkg_setup() {
enewgroup ${PN}
@@ -27,22 +25,17 @@ pkg_setup() {
src_prepare() {
default
- sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+ sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
}
src_compile() {
- export -n GOCACHE XDG_CACHE_HOME #672926
- pushd src/${EGO_PN} || die
mkdir -p bin || die
- GO111MODULE=on GOPATH="${S}" promu build -v --prefix bin || die
- popd || die
+ promu build -v --prefix bin || die
}
src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/pushgateway
+ dobin bin/*
dodoc {README,CHANGELOG,CONTRIBUTING}.md
- popd || die
keepdir /var/lib/${PN} /var/log/${PN}
fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index c26177de7500..53b824fb6af8 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/asciinema/Manifest b/app-misc/asciinema/Manifest
index 2806d3cccb63..7c29be14e174 100644
--- a/app-misc/asciinema/Manifest
+++ b/app-misc/asciinema/Manifest
@@ -1,3 +1,3 @@
DIST asciinema-2.0.2.tar.gz 50058 BLAKE2B db04e21f41b76a7b2be1ca119b2c0a2ff29c9e525c35180d2506722b12c7d139087d0a102bd984cecd7d69e2da0ce8ac0f4bc83c631bc1373fecc8de2d29f107 SHA512 27ae831494c2532270940c3e0fedc87ebbdc1e9d8d24c37d1b63d3f74d9722d38e867fa1b46656249e5b0a84ed7ed32bb21da65f06e9c6a8b787aebdce2068f3
-EBUILD asciinema-2.0.2.ebuild 738 BLAKE2B 4d8991184d0dd57e1638b341e261c2b2c3ee951c048031b8960335d543dfa47e731c71159ed36da06b97522fed3de0538d2c6a740c2a7ba7a0f8b020bd16482e SHA512 cbd50a0c9e8426d2f18a7c8c188916bbf1df8ec8139406dba9ad948d43e38e02f7d35032494bb4348e02d204b5ae3ba96c8cf82b2d6cd0168b82e81142cfef96
+EBUILD asciinema-2.0.2.ebuild 732 BLAKE2B 1491de1a361d57ed94d88cbee96885b689727712d61f0b6e8ddd7f06364b8084c580278736d1d94b93c8dac159d5b006432d05642aa71872f78e2b7b3d2164e6 SHA512 7a50154749ab50c5301f7d13824d95379cf970e03865c28c1771785f5cb918a3bfc03d6113a8eb21fb1a2d1baf0e7a312c8a0c5e005c52da8ec22f3d7698969c
MISC metadata.xml 352 BLAKE2B a3fc1910fe080d3617e64abfa1d758ac162556451fbdf1500b5b7b5ae0ecc703004483f2e0a322bccabe2857319faf3ad011f75ddf676c950b5fe59a5feeda1e SHA512 382168389e0950d78c6df79b6ad6dcf8bdf54fc9f877b23dd1e69c3983e931590c82a26694279b83834121af33a4aa8915a9c1907da2bd617b895a2cb4c31d74
diff --git a/app-misc/asciinema/asciinema-2.0.2.ebuild b/app-misc/asciinema/asciinema-2.0.2.ebuild
index 0cd5811c1933..c3687c17779a 100644
--- a/app-misc/asciinema/asciinema-2.0.2.ebuild
+++ b/app-misc/asciinema/asciinema-2.0.2.ebuild
@@ -4,6 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
inherit distutils-r1
DESCRIPTION="Command line recorder for asciinema.org service"
@@ -17,7 +18,6 @@ IUSE="test"
RESTRICT="!test? ( test )"
BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
test? ( dev-python/nose[${PYTHON_USEDEP}] )
"
diff --git a/app-misc/physlock/Manifest b/app-misc/physlock/Manifest
index 6378f00939ff..24bb2cdbb9b7 100644
--- a/app-misc/physlock/Manifest
+++ b/app-misc/physlock/Manifest
@@ -1,3 +1,5 @@
DIST physlock-11.tar.gz 13791 BLAKE2B 73ba9ad238a4566156144a7107018689996691d1a24bab44e9575067efe072cfb6181b409a81ebcad03d42a48ea94fe32fc738f2d730cb1fd0137b2455a5a74b SHA512 d3badf5c99e4e3e16f4e7ec5c59ee8320c845f1b180463900d816206362ce1aa8652f2489453ad5e190cceee2ed61a90acc52e25bb6b4c4a9dc8c4ebd3054938
+DIST physlock-13.tar.gz 14123 BLAKE2B a43f151c1660c38bd028f80742637a51d5108e6769161c88fb269ac03c827e49bd20e521b8face6aa6a71a8ab65ddf8662e81e8251b74c13388070ed04d4e13b SHA512 85c291fb7b146fbd81aacbf94d8af07e727dd9b37b458988eaee5f7a51f9923871f9b19fd9438428635963864de67d3f2a72f938d99ffe6dc3015c3a1b99ea1c
EBUILD physlock-11-r1.ebuild 551 BLAKE2B 50d5ea880dc464903a6d60a18a773eb0286d78923533624dda8c5db954c8b2b6ab3b587e41c3d0231d2cc842684d4c6d143989548a83318045c8e9395bb5566b SHA512 a7bebe09db65ef32be5af4bb73619d8b45dd142cf7d940f77144873b95ea3004536fe15c565c57f3ab711924a778ffaeef50992ec6fb9ee45577890e012fd353
-MISC metadata.xml 757 BLAKE2B 91000aca8e366f965b46d72494b23734db9d5866c41f2f364755b9bf1397ce673ae96a8c182ee732ca3b05fae863cb8caaf61478f708df33ad3fe21e246b4af4 SHA512 34f57b70b867095ad5ddffad1a5a943488699e98495e98631dde72a96fca5260947bcece476e4411d146d6a1f72ed602401455d49343a4fa79faae77b5483625
+EBUILD physlock-13.ebuild 817 BLAKE2B 5ada26b839b729c42bcc6cf056ee065d9ac692b2e2805b4681dea7d24a0e2b112f0c412a86d098dea3bbeadcdf23ed32c5e5067dd638bdb37307e428709cae79 SHA512 3d1e7e195375d1db115cc41bf138442bbbd5019b0f3feb03001af64aadf2733e07a0b955ba2b35c91e94fe1e5d6bd0cae45255666fcbaa1977e87a8573d2726c
+MISC metadata.xml 950 BLAKE2B 3fc676cd63b6c70361d47ac45781b969129100a21c5d374ba8a563dfe9da2ea5eb18e34f07502ef2265af36dc76ceae55cb9b01c58ddab753f225c951e5a6e5a SHA512 bcbd8f01cc353619824dac7dced66bb3ecbb09ae3b11c6403153cee62b9eafa2a5cbb45f1809994901be0915f23006514aa7400be16ecedf27544aa30c9bd8d9
diff --git a/app-misc/physlock/metadata.xml b/app-misc/physlock/metadata.xml
index 3a7f9b503b95..f37bd00b3eed 100644
--- a/app-misc/physlock/metadata.xml
+++ b/app-misc/physlock/metadata.xml
@@ -1,7 +1,14 @@
-
+
+ toshokan@shojigate.net
+ J. Pz
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
Control physical access to a linux computer by locking all of its virtual
terminals / consoles.
diff --git a/app-misc/physlock/physlock-13.ebuild b/app-misc/physlock/physlock-13.ebuild
new file mode 100644
index 000000000000..375d3288bac8
--- /dev/null
+++ b/app-misc/physlock/physlock-13.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lightweight Linux console locking tool"
+HOMEPAGE="https://github.com/muennich/physlock"
+SRC_URI="https://github.com/muennich/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="elogind systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="sys-libs/pam"
+DEPEND="${RDEPEND}
+ elogind? ( sys-auth/elogind )
+ systemd? ( sys-apps/systemd )
+"
+
+pkg_setup() {
+ export MY_CONF="HAVE_SYSTEMD=$(usev systemd) HAVE_ELOGIND=$(usev elogind)"
+}
+
+src_prepare() {
+ default
+ tc-export CC
+}
+
+src_compile() {
+ emake ${MY_CONF}
+}
+
+src_install() {
+ emake ${MY_CONF} DESTDIR="${D}" PREFIX=/usr install
+ dosym login /etc/pam.d/${PN}
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 87049a96b760..cd6608d37665 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/gtg/Manifest b/app-office/gtg/Manifest
index 666ca0c54866..dfd469b7d22a 100644
--- a/app-office/gtg/Manifest
+++ b/app-office/gtg/Manifest
@@ -1,4 +1,3 @@
-AUX fix-help-open.patch 1628 BLAKE2B 47f6cc0f7a88a60408884805781410298239d064fa58c36ee57cf777a5fbb7ff0a7f032d1e5e0d30e903d14b33cea1daaadb8461099cae9e3e36aeedbc513922 SHA512 e0968c48ad22b405b0aa353da21cd199c4cc665a7d1e94ea52bba726798f4e403384a4394d87fbf4a225723c2cb1f2eb54ecd0659f5be869dd36e5ee034e477e
-DIST gtg-0.4.0_pre20200613.tar.gz 4827071 BLAKE2B 80515f064b4a034066a86c1b63dcb4e2510e49493b067991b7135a3914b1d75ebfc7f18132d6db81e55fdec34a0225c3147b55dc1e0c891540b2b895f3768f2d SHA512 8d4c9460693f7a913c224bd22aacec5b7db67faa5e74e8575fe99d2e792e8f95f6480e1d0ecc3ac77b0533403b8baa41ece315bd14782fb3c783315aa3d7a5fb
-EBUILD gtg-0.4.0_pre20200613.ebuild 1537 BLAKE2B 8fde70a21d8a9163ccd1506758710b1e0c050b3dff8edb6598476d313a5edb96c161718672435f69b7564d46c4cdc433e64c145d4b57eb6d1f4f0d53a3d84633 SHA512 60062306cccbd7ccf607667076f413e90e4346c675d6ab6d03236b65d24f8ffe4cb488cbc38bca0f960f51424b894d8bb81facc690d2ccef1b5bae3cdc04c0c4
+DIST gtg-0.4.0.tar.xz 3744752 BLAKE2B fdeabe32135dea24ac6113a486650b66b5143aa745117029b03e26e1bb3f2e8629623b26efdae0c8217741a2b4964b5dc060f0e450c05c950e21ea360f3f3823 SHA512 f2677f6bbc0b6cb21b7882a2bd0342b4919581c12e4aa43c13b5dbc48740418c512a41619584d0d75bfa63ebc4a5460abfbc27360e1817c8832cbecf3c34a60e
+EBUILD gtg-0.4.0.ebuild 1329 BLAKE2B a4da48e80920c74e1f7249e5dda2c3cdb2aea8bb636c776053d531da02531a88911e5c28057d6d0963e7ee9d04db9e8ba12f836378c5d830dd5e2829897fc709 SHA512 c1d6f91a67cf4c0b41d462426bd69bcfa12e2f0f605fc06e1848a9b03402f47207d187aca0456495a23dac89c00b770ff9f497de283dfa3c5e490b7e9ea97c1c
MISC metadata.xml 886 BLAKE2B 5f0068ca29003ca7dc9988c6e648076eb612103a30c0d5bbf60faec65c7e859d8546243d42764f2b09c000c37ad05e665646aefc6493288c856e2ee96f3187ff SHA512 9676a4693ee4c934eb22673f80b13fe61531e6c82b821990d070ad7c3b709a416c14741c870c3845e5d49a1b4c91b7c8fd16b7812d5e7466ebf352f53328f945
diff --git a/app-office/gtg/files/fix-help-open.patch b/app-office/gtg/files/fix-help-open.patch
deleted file mode 100644
index a66d8e95bdd9..000000000000
--- a/app-office/gtg/files/fix-help-open.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f8f4cbf0beda0e82388748c916c6152996b12a8e Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp
-Date: Sat, 20 Jun 2020 01:06:04 +0300
-Subject: [PATCH] Fix opening of the help files
-
-webbrowser python module just opens things in the browser for me, which
-doesn't understand what a "help:gtg" is and routes it back to external
-program dialog if lucky.
-Use Gtk.show_uri instead, which will properly open it in help handler (yelp).
-
-I believe we should be using Gtk.show_uri instead of webbrowser in other
-places as well, but that's something for a different release.
----
- GTG/gtk/application.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/GTG/gtk/application.py b/GTG/gtk/application.py
-index 39a8a5b3..e8091973 100644
---- a/GTG/gtk/application.py
-+++ b/GTG/gtk/application.py
-@@ -28,7 +28,6 @@ from GTG.gtk.browser.main_window import MainWindow
- from GTG.gtk.editor.editor import TaskEditor
- from GTG.gtk.preferences import Preferences
- from GTG.gtk.plugins import PluginsDialog
--from webbrowser import open as openurl
- from GTG.core import clipboard
- from GTG.core.plugins.engine import PluginEngine
- from GTG.core.plugins.api import PluginAPI
-@@ -251,7 +250,10 @@ class Application(Gtk.Application):
- def open_help(self, action, param):
- """Open help callback."""
-
-- openurl("help:gtg")
-+ try:
-+ Gtk.show_uri(None, "help:gtg", Gdk.CURRENT_TIME)
-+ except GLib.Error:
-+ log.error('Could not open help')
-
- def open_backends_manager(self, action, param):
- """Callback to open the backends manager dialog."""
---
-2.20.1
-
diff --git a/app-office/gtg/gtg-0.4.0.ebuild b/app-office/gtg/gtg-0.4.0.ebuild
new file mode 100644
index 000000000000..135111e7c824
--- /dev/null
+++ b/app-office/gtg/gtg-0.4.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson python-single-r1 xdg
+
+DESCRIPTION="Personal organizer for the GNOME desktop environment"
+HOMEPAGE="https://wiki.gnome.org/Apps/GTG/"
+SRC_URI="https://github.com/getting-things-gnome/gtg/releases/download/v0.4/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ >=dev-python/liblarch-3.0[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ ')
+ x11-libs/pango[introspection]
+ x11-libs/gdk-pixbuf[introspection]
+ x11-libs/gtk+:3[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ test? ( $(python_gen_cond_dep '
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/cheetah3[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ ')
+ app-text/pdfjam
+ app-text/pdftk
+ dev-texlive/texlive-latex
+ )
+"
+
+src_install() {
+ meson_src_install
+ python_fix_shebang "${ED}"/usr/bin/gtg
+ python_optimize
+}
+
+src_test() {
+ nosetests -v || die
+}
diff --git a/app-office/gtg/gtg-0.4.0_pre20200613.ebuild b/app-office/gtg/gtg-0.4.0_pre20200613.ebuild
deleted file mode 100644
index d9f3109d2424..000000000000
--- a/app-office/gtg/gtg-0.4.0_pre20200613.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..8} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson python-single-r1 xdg
-
-DESCRIPTION="Personal organizer for the GNOME desktop environment"
-HOMEPAGE="https://wiki.gnome.org/Apps/GTG/"
-COMMIT="abe2a9110dd0fc6a46f2d095013972877ea67d78"
-SRC_URI="https://github.com/getting-things-gnome/gtg/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/gtg-${COMMIT}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome-keyring test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- >=dev-python/liblarch-3.0[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- ')
- x11-libs/pango[introspection]
- x11-libs/gdk-pixbuf[introspection]
- x11-libs/gtk+:3[introspection]
- gnome-keyring? ( gnome-base/libgnome-keyring[introspection] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- test? ( $(python_gen_cond_dep '
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/cheetah3[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- ')
- app-text/pdfjam
- app-text/pdftk
- dev-texlive/texlive-latex
- )
-"
-
-PATCHES=( "${FILESDIR}"/fix-help-open.patch )
-
-src_install() {
- meson_src_install
- python_fix_shebang "${ED}"/usr/bin/gtg
- python_optimize
-}
-
-src_test() {
- nosetests -v || die
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index c85280b96d55..f039611415b0 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index f3904a1e3409..64d97e910809 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -5,6 +5,6 @@ DIST nattka-0.2.9.tar.gz 90735 BLAKE2B f10d3af19785d835e059647e758541c3df5141efb
EBUILD nattka-0.2.6.ebuild 987 BLAKE2B d5960c7995290e5f7083d76762c56bb0cf651df6377f3be076ed98a8d5f20fdef6ede487d7c9bf46dc5e492a2920c9c4d0031f0533cd5cdee5e1f1d25a5b693a SHA512 0419b7f478d373819fc3b929fdb41462c5224ceecb479a19b43479e124588b7729f9f00f15143d093d8a9186adc692c496cd54a19a7275eff166f2f0003e8bf4
EBUILD nattka-0.2.7.ebuild 934 BLAKE2B ea2707d51ddad62f8841323fc04d8610c3a17f06878ffb52e06416906c806628639335f91dc3f10ed9e8400c5278239ad86c7d9e0e496d02ebfb528e7ff816b8 SHA512 12397bfa83da3df1bb94bb7242618b94a01c31173f6178e7772ed9d8cc8b72b5d358b2a0dd3a10c321faaedc9a4f42959a99c3968ed82136e303d5358b58bbc8
EBUILD nattka-0.2.8.ebuild 934 BLAKE2B ea2707d51ddad62f8841323fc04d8610c3a17f06878ffb52e06416906c806628639335f91dc3f10ed9e8400c5278239ad86c7d9e0e496d02ebfb528e7ff816b8 SHA512 12397bfa83da3df1bb94bb7242618b94a01c31173f6178e7772ed9d8cc8b72b5d358b2a0dd3a10c321faaedc9a4f42959a99c3968ed82136e303d5358b58bbc8
-EBUILD nattka-0.2.9.ebuild 933 BLAKE2B d4e726ad08abb74b7d2662ad13a6a66b09d0f6f57a2a0a195fa1fd7f92b7e1b2eb0698a769957750af65ab91eb0e4ce95726328083900d852c83967575227dae SHA512 a30fc22b041cd1b8b4f9c3300070c12281b268990a0e2e44b5054f45e2cf3d0e04c300ee2111a8c5204ee26254a0e98995b460aec4490d96ed6a24e31374d826
+EBUILD nattka-0.2.9.ebuild 932 BLAKE2B f63125556351dd4ca8007be32324969c94e740ffb9872242b4b2fd098ff87dcf5cf0015d235b388864bb6dc03a2d6342fd3af8a70cfd994e32da7e8975540f56 SHA512 5977c05bb837c05df93296753a15b1b0f3e30bf1ab2dbd48fe4393a03678ab45adb77fadb4a29fa2149685c24945f18d14b114422a00f9880f05ec5f4b3bc163
EBUILD nattka-9999.ebuild 887 BLAKE2B 79540de21b995147dc8b7c7d43e3ff14a685bdaca82b667b8a1ecc61643341f34e422d7f710a098854faa445242f2a0f8161df58371b9a4412dd9a27c8073644 SHA512 6ebd99d4f683bd6e217b076303d4e3cc46bba3d09e3265b8a9f7a42ae7d8456c37699e405ae3fc60c0adcc9340881ff6beb7ac1bc8757fdb1c32e842f620e33a
MISC metadata.xml 360 BLAKE2B 81f9162a3ddac3a0f333ee1e33f3012305054a7039b3bab7dedc68caa08d44c355aa40a2e9f61e789ba28fc0c28829a74024fa72476281dc492ef5d39ec62eed SHA512 674f911e11525336a229d3fe80baafa37963479e582ab847d74f70c817b126a10a602ef3f6bf67529b6b2b3d3e576afdc92ab3d2c1e8d1e75407db7a2007f01b
diff --git a/app-portage/nattka/nattka-0.2.9.ebuild b/app-portage/nattka/nattka-0.2.9.ebuild
index bd639516448b..2adc7edbde87 100644
--- a/app-portage/nattka/nattka-0.2.9.ebuild
+++ b/app-portage/nattka/nattka-0.2.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE="depgraph-order"
RDEPEND="
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 741d5e96e4df..772de69a863b 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/ctypes-sh/Manifest b/app-shells/ctypes-sh/Manifest
index 9288f202ac96..a7b0eda90e9f 100644
--- a/app-shells/ctypes-sh/Manifest
+++ b/app-shells/ctypes-sh/Manifest
@@ -1,4 +1,3 @@
-AUX ctypes-sh-1.1-makefile-fix.patch 893 BLAKE2B a665dbb0278fa98408da8e68c0a6fcd7c4558d1b99efc99bee5946f41a2ab864112fb5f7d9f44db5e182b0e190481da44e17a17fba5d954bb3f5b8e353936097 SHA512 4acbc4639058b628c09082aafeb7592b1f85e3db5ffe77d6db8807a6b4ae787c24685f305149ed9a76c5558c01e3d17fd6714aa1103c435364166b76df7baa26
-DIST ctypes-sh-1.1.tar.gz 437637 BLAKE2B d4279812d613a771ed405499dc623fce5faa00c22e75067857cea0a31e4a36a1531f7b27a1edff89075961bf5e8183bf0787a703cb36c1a8cbd7c03d8a18710f SHA512 0e136f5b9fc342875d02b1087daed60eed46f411765538f185d1da61430205113db72994ecdb125aded3eae114b3f487e7af398c1326334efdd197ee7de18a61
-EBUILD ctypes-sh-1.1.ebuild 740 BLAKE2B a4464f179f13d0763e24b4b13bc45679e7a1d63147e1b10240392779379982299b030166b382c63bcfc6ae1c9a1730df21897bd86aef4482df988c37eb6bee01 SHA512 7a698c3831b7c4f551e803c6d1d1fc7f28b293d316a92d2b5b738802bcdfd925bd31aef83cc8ad6f8e706e30ee90f164a553bee46cd4032a7d29f7f14d9e1382
+DIST ctypes-sh-1.2.tar.gz 475531 BLAKE2B 6fe00415244227629b952a0c18f9c95659a3fb22b9f17e109554f11084d27bf4c23eca5bfc49679b63367fa9fe74a20f206ac79955ed6588418033f37b776729 SHA512 23e9c30acc8ed5b4fe93fe1427c406e7c7b18067bbfc3f948126683910efc645cc69e426d771beb715148b54dffce75351b7773d8b54ac13f74d9787db8529f6
+EBUILD ctypes-sh-1.2.ebuild 731 BLAKE2B cbdee5849bad59fcf3a0ab7956e31e0323c4ec0dab15693e05257f2f2982dd6409857b08b9ef31f4f07c9d39777894c2c3f682eb2b5f50eb9fce39054f1ba97e SHA512 901d2817e18509b6a7470a6d48e22b6e3fe65dbb21133ad487d5d0996ddf023684bb28ef4f767fa133e1b653786ac5faa92521bc613e7dc22fda513b8684e655
MISC metadata.xml 558 BLAKE2B 820b7e4f6e8c7fec2ba02cc164090f20464b78a137f53697532224a360c63952e219c77aebfad40f75673e2c8e82b08100358232290701d47fdf6b66426bfebb SHA512 514d59c04f3c419abcf7ab54a8860506bbcca810c2cafb911b4dcf468cb7b81f63e6f5c01b92c3bb5b2d10c2266bb7adf0ba264aba3bfe632aebcf7d1d3fb1a7
diff --git a/app-shells/ctypes-sh/ctypes-sh-1.1.ebuild b/app-shells/ctypes-sh/ctypes-sh-1.1.ebuild
deleted file mode 100644
index e737d10f3e87..000000000000
--- a/app-shells/ctypes-sh/ctypes-sh-1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Foreign function interface for bash"
-HOMEPAGE="http://ctypes.sh/"
-SRC_URI="https://github.com/taviso/${PN/-/.}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/libffi
- virtual/libelf
- app-arch/xz-utils
- app-arch/bzip2
- app-shells/bash[plugins]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-makefile-fix.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_test() {
- pushd test
- PATH="${S}:${PATH}" \
- LD_LIBRARY_PATH="${S}/src/.libs" \
- make CC="$(tc-getCC)" || die "make check failed"
- popd
-}
diff --git a/app-shells/ctypes-sh/ctypes-sh-1.2.ebuild b/app-shells/ctypes-sh/ctypes-sh-1.2.ebuild
new file mode 100644
index 000000000000..a64a6db88110
--- /dev/null
+++ b/app-shells/ctypes-sh/ctypes-sh-1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Foreign function interface for bash"
+HOMEPAGE="http://ctypes.sh/"
+SRC_URI="https://github.com/taviso/${PN/-/.}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ app-arch/bzip2
+ app-arch/xz-utils
+ app-shells/bash[plugins(-)]
+ dev-libs/libffi
+ virtual/libelf
+"
+BDEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_test() {
+ pushd test >/dev/null || die
+ PATH="${S}:${PATH}" \
+ LD_LIBRARY_PATH="${S}/src/.libs" \
+ make CC="$(tc-getCC)" || die "make check failed"
+ popd > /dev/null || die
+}
diff --git a/app-shells/ctypes-sh/files/ctypes-sh-1.1-makefile-fix.patch b/app-shells/ctypes-sh/files/ctypes-sh-1.1-makefile-fix.patch
deleted file mode 100644
index 9a2965a62bc5..000000000000
--- a/app-shells/ctypes-sh/files/ctypes-sh-1.1-makefile-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 5e305160cc219fa63658148e3d258cb62dd043a3
-Author: rtlanceroad
-Date: Wed Jul 27 14:49:21 2016 +0800
-
- fix Makefile.am in src dir
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 8a9b682..71347bb 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -11,6 +11,6 @@ ctypes_la_LIBADD += libstruct.la
- noinst_LTLIBRARIES += libstruct.la
- noinst_HEADERS += struct/dutil.h struct/dwarves.h struct/elf_symtab.h struct/gobuffer.h struct/hash.h struct/list.h struct/rbtree.h struct/strings.h
- libstruct_la_SOURCES = struct/dutil.c struct/dwarves.c struct/gobuffer.c struct/struct.c struct/strings.c struct/dwarf_loader.c struct/dwarves_fprintf.c struct/elf_symtab.c struct/rbtree.c
--libstruct_la_CFLAGS = -std=gnu99 -D_GNU_SOURCE
-+libstruct_la_CFLAGS = -std=gnu99 -D_GNU_SOURCE $(FFI_CFLAGS)
- libstruct_la_CPPFLAGS = -I../include -I../lib
- endif
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 512c01b43a8f..7b4cbbb75112 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,7 +1,9 @@
AUX dash-0.5.20.2-gcc-fno-common.patch 1131 BLAKE2B cce4ed8a97d95e294aa7679c0ef164337a836ed9f0b7e18b38a6032545796260eba8c7502817e57bc5948aadb74b9826eb7cb5b02e66cdb954e35a5ed762f460 SHA512 6056f196a353f382b97c6865e89dbc5a63295c404fc9be83551b1458e2a42f93786ec3d0b7dac1b674b40b59e90cd968d6f1e9e0c8ca953704f4de8bb9251cbb
AUX dash-0.5.9.1-format-security.patch 374 BLAKE2B 63a9128f8a396e9c9808867ffdff90f1a176a99108db02d4ff03395d74c9eb69039604d3921cb26c42aced4411caa27cf20eafced3febbb4b175a7d118b66ca0 SHA512 4726d96ad1a86e47374c129f1cbd13bf5f2b6c77faa4e3e85be65978222cc040175313218fe29da176af2bbc2546c432d84247ea342d261a284b64b42ce138c6
DIST dash-0.5.10.2.tar.gz 225196 BLAKE2B af48879d29aee8041949b51f08eb89c3938e77b2e05553a3e1a9939da7b00fd80f7b9fb35f33e18b0c11850bfb1b8377e9dc9bcfd80754fd29c9d160e0ce5a4d SHA512 0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640
+DIST dash-0.5.11.1.tar.gz 244439 BLAKE2B 88f877954aca739621133fadd32cf8bf1ca5d334ef212da622501b1235caee3a91e9b8b481c7a45f3fb6d6eee1036c2e0f1fd387638c910eff90e8e0a1eaa419 SHA512 6403ac793c87c9101bd5f3b2df74200ce1a992d0c432aa79375d4479b87c83279f303239af5080728c8a64ef4520e39fe8f0f1e037a0a38ffce1e4dd057d9c72
DIST dash-0.5.11.tar.gz 238776 BLAKE2B 0d399b35c10a33f6a22f51f7b74b9e092fb11d47ae45948f43fab0dd1416061145e7f930f0f0d1119d02cc45790ba19ce040c951322c131e706e5f3f32f2612b SHA512 41c3afa8aa4788f7899b9a4c1bce2dc8629f4405184cdc7269993e72c695cf9537c9e68b654d56f06c604a82ffa73c9160b91368e82a3593a12ff7dea10505d1
EBUILD dash-0.5.10.2-r1.ebuild 1599 BLAKE2B bd791b7188f16fe8bf627321cc99b9bd165d35c4bd42f6c5c9de0446ba99277ffbe88f6df1cfd6c51518f5f506b9966680159e0bbc7fa46ee34d881368ae1ce9 SHA512 672b9b87555c251c071772a505b77f70190513692002ee974587e6905fc4f100eba3cde7d115f380ceb0d8102fc7e3091354e8693ce466cb48f7d88713ec0d3b
+EBUILD dash-0.5.11.1.ebuild 1529 BLAKE2B 024ab6c9362510e03778238a95f3ec21d3d19211258aff8f14d9d6bf15436689b39cc73543e068e687fd0ff9f4390611c4e6b01de497a31d8ff6b42ea80297e9 SHA512 74cc3b72b2d6179d20caa9d8a2bc0341a9428944caaafb366ccd770946555b9f9a746831212a3a35a99166e6e6af9b5f7315b29861e0ed0334fb80d57510120c
EBUILD dash-0.5.11.ebuild 1529 BLAKE2B 024ab6c9362510e03778238a95f3ec21d3d19211258aff8f14d9d6bf15436689b39cc73543e068e687fd0ff9f4390611c4e6b01de497a31d8ff6b42ea80297e9 SHA512 74cc3b72b2d6179d20caa9d8a2bc0341a9428944caaafb366ccd770946555b9f9a746831212a3a35a99166e6e6af9b5f7315b29861e0ed0334fb80d57510120c
MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd
diff --git a/app-shells/dash/dash-0.5.11.1.ebuild b/app-shells/dash/dash-0.5.11.1.ebuild
new file mode 100644
index 000000000000..9482c8379d58
--- /dev/null
+++ b/app-shells/dash/dash-0.5.11.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Debian Almquist Shell"
+HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
+SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libedit static"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
+DEPEND="${RDEPEND}
+ libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
+
+src_prepare() {
+ default
+
+ # Fix the invalid sort
+ sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
+
+ # Use pkg-config for libedit linkage
+ sed -i \
+ -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \
+ configure || die
+}
+
+src_configure() {
+ # don't redefine stat on Solaris
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ export ac_cv_func_stat64=yes
+
+ # if your headers strictly adhere to POSIX, you'll need this too
+ [[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255
+ fi
+ append-cppflags -DJOBS=$(usex libedit 1 0)
+ use static && append-ldflags -static
+ # Do not pass --enable-glob due to #443552.
+ local myeconfargs=(
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+ --bindir="${EPREFIX}"/bin
+ --enable-fnmatch
+ $(use_with libedit)
+ )
+ econf "${myeconfargs[@]}"
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 189ec39e8533..a43e55a9ac7a 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 5c45299338ae..9eff16c57871 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -8,10 +8,11 @@ DIST calibre-4.17.0.tar.xz 37027156 BLAKE2B e1e9fbbb93cc14af0790e400d79b433c774f
DIST calibre-4.18.0.tar.xz 37135328 BLAKE2B 247fc226fade064306309933be008e7636bacfdcfb1c96ae900fce5cc4474e26853b3a9dd932fd758543e31af95374f089d2e7a15c3d9ca7655eabd077727e2c SHA512 cc75e8b78722eb286af57f1d6b1ed783647f69471d903a3d4dd458b3f6966804e8e4fda7bd1947e9107ce9a280486ea7de101f7b843f8365bfe6e874d9ebf3d3
DIST calibre-4.19.0.tar.xz 37172532 BLAKE2B 1cf3a4727ac7a2e7fe4d926acad7e6324b0673728db862209d98280f4fe9457eb33d734e47ac4882accebad2a6ffd12aa0add6bdcfe64cc4baa8a39dc2b4b94f SHA512 47b767b3f23f01fa1931abd470eb69f5493f5b0e6cd5c0e566b5576d1d831137c28555de3f73ad2a2dd0dd03615171a4c62356278a590ad48b77a6ca1cac890b
DIST calibre-4.20.0.tar.xz 36997620 BLAKE2B 28ee9539eda96809004f4c276c8dceba119122379867f4b9235ad52a3ec68337330c4cbc2e715462f27ea0c3a0c8470609a50273db49a69f69a60e7fbcef11a5 SHA512 97e33c0a4a53c0b799ed76fde6327570d3e6356a812836d204ce0e6f5273715e274fdf2e987a0446b61ce6aceb4ce5cfda9c0cb8a2f2871efd83b76acbc43820
+DIST calibre-4.9.1-bug-731786.patch 1069 BLAKE2B 8b57fb89c9ec2d3a435fbc90f514d45468ceb96b46428efd5d2084cc9bb6137b49dd90dc2f7e574b6d8b8d536728392863046b068c39c8f9bcc3ae23678ac590 SHA512 acd158923bb369270155b3032b033a8387bcb53d1b0ea3e2c0724a40ec0cff6add5fca85649caaf37db0a0878fc3dafacc98b2b641cf10a8d58dc719642c6be5
DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
EBUILD calibre-4.17.0-r1.ebuild 8765 BLAKE2B 5fdb90f47e390d3935639673f63c2fdd9a5e64ae5635f5a1e5732c176831f5b91decb2dead5ddc79eafd786b64ccd95aa6b0943038428f8aa6331ed45beda222 SHA512 3235f8bac83d558268c0e41b6a313204b87e545dd7606309aaed0d2b9ab8a867562f0dd5127e90bd8d8d56dc4371c46c2d0091bcefa9815cbc3b1da31f00b4ec
EBUILD calibre-4.18.0.ebuild 8697 BLAKE2B 2375f915eb98ca26ac5ad31db9a0ffee9ec8cc6694b0a7daca9eda35604c1ca606f71b3e3b7277033ba9c35e35abbc9ffdf02fceb2f1d72cc286a6d6daf357aa SHA512 48ccd11e78545cd8f489ad0a7fa1e660ed52e68dadf54d1439baa1a378afa67d766e6f7b0c0c5bd53538695e274e2fa4c2a6bb0555d5898d854cac56660a9cda
EBUILD calibre-4.19.0.ebuild 8550 BLAKE2B fcaf2c66cd59bbe0017ab5ead307bb532ac1ae8f5fcc9c0b4e015ec652646f8faed0d108ccbf29675384265f07fb6720634abe757faa6653a73146c685caa7f4 SHA512 01f6b7944e0ae5ffdf420b8046a104200217f958fcdeef057ba5e81a06bc04ffb9b1b2a8bcddcc3b50bd2d3dfd27b738df9084454d2bd7ae51ed28ab7b78d714
EBUILD calibre-4.20.0.ebuild 8550 BLAKE2B fcaf2c66cd59bbe0017ab5ead307bb532ac1ae8f5fcc9c0b4e015ec652646f8faed0d108ccbf29675384265f07fb6720634abe757faa6653a73146c685caa7f4 SHA512 01f6b7944e0ae5ffdf420b8046a104200217f958fcdeef057ba5e81a06bc04ffb9b1b2a8bcddcc3b50bd2d3dfd27b738df9084454d2bd7ae51ed28ab7b78d714
-EBUILD calibre-4.9.1-r2.ebuild 8799 BLAKE2B abbcecaeec5f818cf7ed218edef294ee45d53861b3a8a573ac8c119deeb3d6f25ee16c42433daefb41a1b05eb7ffef007759632d6823b731931c57b60272cd30 SHA512 8989bcbb4e122b2e7ad8fde2b671ed71173658a6b05932b2b56e270e600d84ac916d61af1e2eb63dd146b9ff8801670cd42a2ba8db5a6aca3f21e944f1ecbd43
+EBUILD calibre-4.9.1-r3.ebuild 8974 BLAKE2B 871509d091927a9cbc6e7f6068e41a47564e81f6f671835ef7d8b8c6945aa34b920287b5b99f50739f3f6190533a7d6fcd943f577f6debb7f686e56beb9c51e2 SHA512 814476d913f091d974f275ecbcc021ef40281de948bf4a9a714c4345934245f81dbe1d8b5882167313684622526edc71a9cb1aebf9f4ac0abfeb01e586b2e76b
MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-4.9.1-r2.ebuild b/app-text/calibre/calibre-4.9.1-r2.ebuild
deleted file mode 100644
index 0eb5f2c1295d..000000000000
--- a/app-text/calibre/calibre-4.9.1-r2.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz
- https://github.com/kovidgoyal/calibre/commit/db7007a25faefb0cc90e64dda1c0793393b9512d.patch -> calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch"
-
-LICENSE="
- GPL-3+
- GPL-3
- GPL-2+
- GPL-2
- GPL-1+
- LGPL-3+
- LGPL-2.1+
- LGPL-2.1
- BSD
- MIT
- Old-MIT
- Apache-2.0
- public-domain
- || ( Artistic GPL-1+ )
- CC-BY-3.0
- OFL-1.1
- PSF-2
-"
-KEYWORDS="amd64 ~arm x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-text/hunspell-1.7:=
- >=app-text/podofo-0.9.6_pre20171027:=
- >=app-text/poppler-0.26.5[qt5]
- >=dev-libs/chmlib-0.40:=
- dev-libs/glib:2=
- dev-libs/hyphen:=
- >=dev-libs/icu-57.1:=
- dev-libs/libinput:=
- >=dev-libs/dbus-glib-0.106
- >=sys-apps/dbus-1.10.8
- $(python_gen_cond_dep '
- >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
- dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
- >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
- >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
- >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
- >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
- dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
- >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
- >=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
- >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
- >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
- >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
- >=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
- >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
- >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
- >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
- >=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
- dev-python/regex[${PYTHON_MULTI_USEDEP}]
- ')
- dev-qt/qtcore:5=
- dev-qt/qtdbus:5=
- dev-qt/qtgui:5=
- >=dev-qt/qtwebengine-5.12
- dev-qt/qtwidgets:5=
- dev-util/desktop-file-utils
- dev-util/gtk-update-icon-cache
- media-fonts/liberation-fonts
- media-libs/fontconfig:=
- >=media-libs/freetype-2:=
- >=media-libs/libmtp-1.1.11:=
- >=media-libs/libwmf-0.2.8
- >=media-gfx/optipng-0.7.6
- >=sys-libs/zlib-1.2.11:=
- virtual/libusb:1=
- x11-libs/libxkbcommon:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXrender:=
- x11-misc/shared-mime-info
- >=x11-misc/xdg-utils-1.0.2-r2
- ios? (
- >=app-pda/usbmuxd-1.0.8
- >=app-pda/libimobiledevice-1.2.0
- )
- udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
- udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}
- $(python_gen_cond_dep '
- >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
- dev-python/sip[${PYTHON_MULTI_USEDEP}]
- ')
- >=virtual/podofo-build-0.9.6_pre20171027
- virtual/pkgconfig"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
- eerror "Calibre cannot be built with this version of gcc."
- eerror "You need at least gcc-6.0"
- die "Your C compiler is too old for this package."
- fi
-}
-
-src_prepare() {
- # no_updates: do not annoy user with "new version is availible all the time
- # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
- eapply \
- "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
- "${FILESDIR}/${PN}-disable_plugins.patch" \
- "${FILESDIR}/${PN}-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch" \
- "${DISTDIR}/calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch"
-
- eapply_user
-
- # Fix outdated version constant.
- #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
- # -i src/calibre/constants.py || \
- # die "sed failed to patch constants.py"
-
- # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
- # calls xdg-* (bug #258938).
- sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
- -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
- -e "s|, PreserveMIMEDefaults():|:|" \
- -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
- -e "s|cmd\[2\]|cmd[4]|" \
- -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
- -i src/calibre/linux.py || die "sed failed to patch linux.py"
-
- # Disable unnecessary privilege dropping for bug #287067.
- sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
- -i setup/install.py || die "sed failed to patch install.py"
-
- sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
- -i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
- # calibre works with python 3, so remove the python 2 constraint
- export CALIBRE_PY3_PORT=1
-
- # Bypass kbuildsycoca and update-mime-database in order to
- # avoid sandbox violations if xdg-mime tries to call them.
- cat - > "${T}/kbuildsycoca" <<-EOF
- #!${BASH}
- echo $0 : $@
- exit 0
- EOF
-
- cp "${T}"/{kbuildsycoca,update-mime-database} || die
- chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
- export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
- # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
- # violation with kbuildsycoca as in bug #287067, comment #13.
- export -n DISPLAY
-
- # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
- # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
- # return _parse_localename(localename)
- # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
- # raise ValueError, 'unknown locale: %s' % localename
- #ValueError: unknown locale: 46
- export -n LANG LANGUAGE ${!LC_*}
- export LC_ALL=C.utf8 #709682
-
- # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
- # variables to point to our fake temporary $HOME.
- export HOME="${T}/fake_homedir"
- export XDG_CONFIG_HOME="${HOME}/.config"
- export XDG_DATA_HOME="${HOME}/.local/share"
- export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
- mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
- tc-export CC CXX
- # Bug #334243 - respect LDFLAGS when building extensions
- export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
- local libdir=$(get_libdir)
- [[ -n $libdir ]] || die "get_libdir returned an empty string"
-
- addpredict /dev/dri #665310
-
- PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
- "${PYTHON}" setup.py install \
- --root="${D}" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/${libdir}" \
- --staging-root="${ED}/usr" \
- --staging-libdir="${ED}/usr/${libdir}" || die
-
- rm "${ED}/usr/share/applications/defaults.list" || die
- find "${ED}"/usr/share -type d -empty -delete
-
- cd "${ED}"/usr/share/calibre/fonts/liberation || die
- local x
- for x in * ; do
- [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
- ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
- done
-
- einfo "Converting python shebangs"
- python_fix_shebang --force "${ED}"
-
- einfo "Compiling python modules"
- python_optimize "${ED}"/usr/lib/calibre
-
- newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
- newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
- bashcomp_alias calibre \
- lrfviewer \
- calibre-debug \
- ebook-meta \
- calibre-server \
- ebook-viewer \
- ebook-polish \
- fetch-ebook-metadata \
- lrf2lrs \
- ebook-convert \
- ebook-edit \
- calibre-smtp \
- ebook-device
-
-}
-
-pkg_preinst() {
- # Indentify stray directories from upstream's "Binary install"
- # method (see bug 622728).
- CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
- CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
- printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
- [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
- local x
- for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
- if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
- elog "Purging '${x}'"
- rm -rf "${x}"
- fi
- done
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-4.9.1-r3.ebuild b/app-text/calibre/calibre-4.9.1-r3.ebuild
new file mode 100644
index 000000000000..b38a6d256982
--- /dev/null
+++ b/app-text/calibre/calibre-4.9.1-r3.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+ https://github.com/kovidgoyal/calibre/commit/db7007a25faefb0cc90e64dda1c0793393b9512d.patch -> calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch
+ https://github.com/kovidgoyal/calibre/commit/7b6416ac6522fc40f24f6baf3ca552b17a8b91d6.patch -> calibre-4.9.1-bug-731786.patch"
+
+LICENSE="
+ GPL-3+
+ GPL-3
+ GPL-2+
+ GPL-2
+ GPL-1+
+ LGPL-3+
+ LGPL-2.1+
+ LGPL-2.1
+ BSD
+ MIT
+ Old-MIT
+ Apache-2.0
+ public-domain
+ || ( Artistic GPL-1+ )
+ CC-BY-3.0
+ OFL-1.1
+ PSF-2
+"
+KEYWORDS="amd64 ~arm x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-text/hunspell-1.7:=
+ >=app-text/podofo-0.9.6_pre20171027:=
+ >=app-text/poppler-0.26.5[qt5]
+ >=dev-libs/chmlib-0.40:=
+ dev-libs/glib:2=
+ dev-libs/hyphen:=
+ >=dev-libs/icu-57.1:=
+ dev-libs/libinput:=
+ >=dev-libs/dbus-glib-0.106
+ >=sys-apps/dbus-1.10.8
+ $(python_gen_cond_dep '
+ >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+ dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+ >=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+ dev-python/regex[${PYTHON_MULTI_USEDEP}]
+ ')
+ dev-qt/qtcore:5=
+ dev-qt/qtdbus:5=
+ dev-qt/qtgui:5=
+ >=dev-qt/qtwebengine-5.12
+ dev-qt/qtwidgets:5=
+ dev-util/desktop-file-utils
+ dev-util/gtk-update-icon-cache
+ media-fonts/liberation-fonts
+ media-libs/fontconfig:=
+ >=media-libs/freetype-2:=
+ >=media-libs/libmtp-1.1.11:=
+ >=media-libs/libwmf-0.2.8
+ >=media-gfx/optipng-0.7.6
+ >=sys-libs/zlib-1.2.11:=
+ virtual/libusb:1=
+ x11-libs/libxkbcommon:=
+ x11-libs/libX11:=
+ x11-libs/libXext:=
+ x11-libs/libXrender:=
+ x11-misc/shared-mime-info
+ >=x11-misc/xdg-utils-1.0.2-r2
+ ios? (
+ >=app-pda/usbmuxd-1.0.8
+ >=app-pda/libimobiledevice-1.2.0
+ )
+ udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+ $(python_gen_cond_dep '
+ >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')
+ >=virtual/podofo-build-0.9.6_pre20171027
+ virtual/pkgconfig"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
+ eerror "Calibre cannot be built with this version of gcc."
+ eerror "You need at least gcc-6.0"
+ die "Your C compiler is too old for this package."
+ fi
+}
+
+src_prepare() {
+ # no_updates: do not annoy user with "new version is availible all the time
+ # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+ eapply \
+ "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+ "${FILESDIR}/${PN}-disable_plugins.patch" \
+ "${FILESDIR}/${PN}-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch" \
+ "${DISTDIR}/calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch" \
+ "${DISTDIR}/calibre-4.9.1-bug-731786.patch"
+
+ eapply_user
+
+ # Fix outdated version constant.
+ #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+ # -i src/calibre/constants.py || \
+ # die "sed failed to patch constants.py"
+
+ # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+ # calls xdg-* (bug #258938).
+ sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+ -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+ -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+ -e "s|, PreserveMIMEDefaults():|:|" \
+ -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+ -e "s|cmd\[2\]|cmd[4]|" \
+ -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+ -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+ -i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+ # Disable unnecessary privilege dropping for bug #287067.
+ sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+ -i setup/install.py || die "sed failed to patch install.py"
+
+ sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+ -i setup/build.py || die "sed failed to patch build.py"
+}
+
+src_install() {
+ # calibre works with python 3, so remove the python 2 constraint
+ export CALIBRE_PY3_PORT=1
+
+ # Bypass kbuildsycoca and update-mime-database in order to
+ # avoid sandbox violations if xdg-mime tries to call them.
+ cat - > "${T}/kbuildsycoca" <<-EOF
+ #!${BASH}
+ echo $0 : $@
+ exit 0
+ EOF
+
+ cp "${T}"/{kbuildsycoca,update-mime-database} || die
+ chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+ export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+ # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+ # violation with kbuildsycoca as in bug #287067, comment #13.
+ export -n DISPLAY
+
+ # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+ # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+ # return _parse_localename(localename)
+ # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+ # raise ValueError, 'unknown locale: %s' % localename
+ #ValueError: unknown locale: 46
+ export -n LANG LANGUAGE ${!LC_*}
+ export LC_ALL=C.utf8 #709682
+
+ # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+ # variables to point to our fake temporary $HOME.
+ export HOME="${T}/fake_homedir"
+ export XDG_CONFIG_HOME="${HOME}/.config"
+ export XDG_DATA_HOME="${HOME}/.local/share"
+ export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+ mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+ tc-export CC CXX
+ # Bug #334243 - respect LDFLAGS when building extensions
+ export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+ local libdir=$(get_libdir)
+ [[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+ addpredict /dev/dri #665310
+
+ PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+ "${PYTHON}" setup.py install \
+ --root="${D}" \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/${libdir}" \
+ --staging-root="${ED}/usr" \
+ --staging-libdir="${ED}/usr/${libdir}" || die
+
+ rm "${ED}/usr/share/applications/defaults.list" || die
+ find "${ED}"/usr/share -type d -empty -delete
+
+ cd "${ED}"/usr/share/calibre/fonts/liberation || die
+ local x
+ for x in * ; do
+ [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
+ ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+ done
+
+ einfo "Converting python shebangs"
+ python_fix_shebang --force "${ED}"
+
+ einfo "Compiling python modules"
+ python_optimize "${ED}"/usr/lib/calibre
+
+ newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+ newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+ bashcomp_alias calibre \
+ lrfviewer \
+ calibre-debug \
+ ebook-meta \
+ calibre-server \
+ ebook-viewer \
+ ebook-polish \
+ fetch-ebook-metadata \
+ lrf2lrs \
+ ebook-convert \
+ ebook-edit \
+ calibre-smtp \
+ ebook-device
+
+}
+
+pkg_preinst() {
+ # Indentify stray directories from upstream's "Binary install"
+ # method (see bug 622728).
+ CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+ CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+ printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+ [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+ local x
+ for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+ if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+ elog "Purging '${x}'"
+ rm -rf "${x}"
+ fi
+ done
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
index 2efb14d91863..cf408754e81d 100644
--- a/app-text/foliate/Manifest
+++ b/app-text/foliate/Manifest
@@ -1,5 +1,7 @@
DIST foliate-2.2.1.tar.gz 4310842 BLAKE2B 3e858379c84a790d1ce4d60af25c4911d2864d7b82f1896216ae8a01598ae7865d65b90056348b372b328e84184e75fcbacfbb2b6fdb8aa9a7e254e726957c4f SHA512 3c9c3d8f2df72fcb8699ccf23bf1850c129c6f387a9b12489d8fcc3dd1da4da5a7e0707f74f4607ab0e28d67e2f55f0bb2d053fbbc072bc9915c54c4857e4cff
DIST foliate-2.4.1.tar.gz 4637388 BLAKE2B 4dfc0e0de5c668e73d80ff86b009f4711f0a439e6defd01a591f6271dab2de403d5f5304b29cad6c04661ee3da4d821416952324b500f73d22cdb62f85f97fed SHA512 25ae76232cb70722b0bb17d8a22c72011d99b7029f4ce70fa85a2f4baa2f93ce1fb855f5a03df882fe6f6af42101d4a368dc05a09d5fbeb78cb503b5d57fffe1
+DIST foliate-2.4.2.tar.gz 4638211 BLAKE2B 4263e047d7251a0f15a2cda2592ba24dbbb9754a37ba6367f0d1e778e3f926cd46777d505e9f92d74bdcd28a722988b60f064f1a841c53a9b2849130941d9481 SHA512 6dda76c9bd3f9f3273bafdd65463adfcab84d9c81ca89c2fd1cda4c5d7618d84610e11c75936c5df2bb118caa3f3e1e77ded506da670263e5af5b0ad92a97a07
EBUILD foliate-2.2.1.ebuild 980 BLAKE2B 38bf7445278159e8d914dad322e8d3164a2e7edacc6a37f149f625897c0f98aab560679eb4d984fac9660084227ef696996b51ac7d50657c0fbcf8c9fe86ccaa SHA512 633d6da653eb3ffe94b3a7fc576e5cf20cf085d69798c76ef82efdfe64e86bfbe20ef8ead5cb2f386c01237ee0e0ec4fe9df63c6d62ddc2d6e4e2027aea3a568
EBUILD foliate-2.4.1.ebuild 989 BLAKE2B b7ba41af802147c897f3cd694f92875db7c7e14763f999574e5148fa92c6a3e24bf4c2202a6ea23194b9d1ba816a6ae4322561476e32cecaaf0d8a271eb509cf SHA512 caa014eebe9c1817ccad5f97f45ccef805cfc3c4e5a8783067ce0a1b0ff30e9097b9533df63f8ae6044a8eb036108b1039041179f4d8ae12e966514375b2643f
+EBUILD foliate-2.4.2.ebuild 989 BLAKE2B b7ba41af802147c897f3cd694f92875db7c7e14763f999574e5148fa92c6a3e24bf4c2202a6ea23194b9d1ba816a6ae4322561476e32cecaaf0d8a271eb509cf SHA512 caa014eebe9c1817ccad5f97f45ccef805cfc3c4e5a8783067ce0a1b0ff30e9097b9533df63f8ae6044a8eb036108b1039041179f4d8ae12e966514375b2643f
MISC metadata.xml 526 BLAKE2B 9663aeafbe2182662001d238253587b45512bf1d71308e7e1d0fbd197c88d2cf384ff38a464da61facabbc8eeb3e391abc382426291eb75a2853ede4152d490c SHA512 0132f71baba803835fe3789cbb41d6a7d98fcfe06ff14e6212f734d807ed0b3ce0e4379d5531f1f23a82b99672102d227ce3eeeb9a7e2f94ead65755f1c7cf24
diff --git a/app-text/foliate/foliate-2.4.2.ebuild b/app-text/foliate/foliate-2.4.2.ebuild
new file mode 100644
index 000000000000..74315efa5dec
--- /dev/null
+++ b/app-text/foliate/foliate-2.4.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PLOCALES="cs_CS de_DE es fr_FR id_ID ie it nl pt_BR ru_RU sv tr uk zh_CN zh_TW"
+inherit meson l10n xdg-utils gnome2-utils
+SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="gtk ebook reader built with gjs"
+HOMEPAGE="https://github.com/johnfactotum/foliate/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="${MESON_DEPEND}
+ sys-devel/gettext"
+RDEPEND="dev-libs/gjs
+ net-libs/webkit-gtk"
+
+src_prepare() {
+ default
+
+ l10n_find_plocales_changes "${S}"/po '' '.po'
+
+ rm_po() {
+ rm po/${1}.po
+ sed -e "/^${1}/d" -i po/LINGUAS
+ }
+
+ l10n_for_each_disabled_locale_do rm_po
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+ gnome2_schemas_update
+}
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 0de60340e3b5..664ebb87f58b 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -3,5 +3,5 @@ AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d
AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb32c4158009c3444d43f506d19b94d0aa79d746ba409ec429d467e29619cd32894e935b8f8c0deda7f0ed2600841c6 SHA512 297f337895f805c9ce27ae63f424c88e8f153fb8f6724aedc11dd564acee6264b8eba01b09f43d75585d6d5bf3eb245db69b3da00c349c3c1c0d04a5a99b1b48
DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
EBUILD hunspell-1.7.0-r1.ebuild 2317 BLAKE2B 9557168fd901afe16a8402a682cf06cb97f6a6fd367caef811e31acc92f04f2b77a907d409e9d77b6389425eaad901a0084bb8d38d69935648da4bda9ae6ac47 SHA512 e2926c1860838c46fcddb6bb7c05462d6908fb188791ddcc677243394cf46902ed01198c53e137f7860c418c27c20ac59de21d4033fc624c168fdd60c104c69b
-EBUILD hunspell-1.7.0-r2.ebuild 2370 BLAKE2B 84a949291c56d9d381ac1f9670dc11b26580138565dd11421a78c91c6a0be1e0affa8a44f47dfcd6317538bee68a0bded332afbc4379f5acaa72c2fb6e284a1a SHA512 a6797b617b6a6356b3b739ad79151bf2ad72be26c1b3fba476c8fbfd63a3931449323a0ec91a972e545f2cd555311b544eefad37e792bb06e98726340abffe06
+EBUILD hunspell-1.7.0-r2.ebuild 2369 BLAKE2B 0fc76916e50f793069dbc12baccd2d5f42424032c97d98d9512659ac2134f725ca003fa0b51807608f06e6bc5f9b0dd1faac95d14caf2e1b5e0b9f2b5e4ddba4 SHA512 47776b6b62a937edb3d98a9e2e57711f1d9c7417e69d488ada95ae8d76f6d2c77e1b0bba8521692dbeee30e95172130a73843d39ffabcb5444761fc4aa921f61
MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71
diff --git a/app-text/hunspell/hunspell-1.7.0-r2.ebuild b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
index e7400fe3c6b5..f6a51eacd8eb 100644
--- a/app-text/hunspell/hunspell-1.7.0-r2.ebuild
+++ b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hunspell"
SLOT="0/$(ver_cut 1-2)"
LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
ncurses? ( sys-libs/ncurses:0= )
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 7cb70634fdb1..bbe4c0847ef5 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index c7115edb96ba..3344ab0a2fd8 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -32,17 +32,17 @@ DIST mysql-extras-20200523-1221Z.tar.bz2 345015 BLAKE2B 3ad0da663c31831d3b511b88
EBUILD mariadb-10.1.38-r1.ebuild 29427 BLAKE2B 4817945be76f85f162f6a26381d1e327bd0907304e9376faf3828f9c8e7ac7f0e8bec344b64af6da5bf78dafd1d8d40a44e2554c1862e9adce0666f2e990da61 SHA512 2b611ad16609527f1c5f1857ffc893a48b70a1d52018d0907723be892268d7c64dfcb727e44e64af9ae9f992585990dd13a5af64acb07f3a5ba2abb35562afad
EBUILD mariadb-10.1.43.ebuild 29830 BLAKE2B 0b105fd2ea914b0e7fe5d47c58784a1c68f5dcb57c90e612bd207bd6ee7cb6b4e7f20e4e3d4e257326742963cd132336939d5bbbff35c669f668dd3f71146aab SHA512 4e6156acf7f78aa79293b6b11c535a862d21ccbe0592c100cba3a5bf4f3db770e2a1e8ab25e914e22a8cb2bbf247dee79fcf686e6357c72a1dfe65e5398713b9
EBUILD mariadb-10.1.44-r1.ebuild 32167 BLAKE2B ea6304c6e0ef890a5443d4e46bd172876705b93e4c35bbf64935c8ae78d38e7baf44c433317dadac14ffca699df19df744e68ec782945bbf603c092b0cda77fb SHA512 54c45813c42e55b109e27b35d78a2d404ad038db6eefbc90d6c4382c9d30a15164ab1febed3efef03b7cd68012e164ec8bafa6e010eb5838881609d44ba5bc75
-EBUILD mariadb-10.1.45.ebuild 30680 BLAKE2B 65f92516ca54929ee1b8ec0d1d2232de781b98f431d29960517824334b603faa9abeb7adf0e3c11a625fabeaf9f8234e1a5da7b518b56ed7dc7994149d952df5 SHA512 6745875628c333b0df7267fb71c64d0ac99ac298cd42fff1843ab44d6302ee7eb11ab6255dd22853242de3e72bd0ca6d53a4b83f81ecdbe870062ebff2ba423a
+EBUILD mariadb-10.1.45.ebuild 30679 BLAKE2B c521c251f487ff7f0fe5da8b846c099041cb9075ad1e8b2996b074fca3804a039d791449064f25fb1183fa69a165363b37c8a51d69ec0d8ddd16004dd5b9c829 SHA512 f60630c0ae966f380330689c3f20c0708ae9414c4d1d6bed3e662678f14b7f8582c4e0609de02f809312b2528b7f2b7d7cd660386fecb2bcdb41fcf36ce15bd0
EBUILD mariadb-10.2.22-r1.ebuild 32490 BLAKE2B 1909cd64d969d82cd7826920aa04a9c92c7022d8d0b395f1ca8bf237cd2ad86ec919c9e4412aac3788b7cd5956df5f8d06bc18df345c12f3382405ecc9e920b7 SHA512 d219c571b941e3f3214bef82893507ec8ed233a6623f0cb7dba9e327fef628afca9af610a49378697ba10f14b6137eab50d5f0290fde46871970cf56d31b6e6c
EBUILD mariadb-10.2.29.ebuild 33063 BLAKE2B 0cbf1bf88713221ef663ebb4e3e7e60e170890177b272a3ed851b192e3f45700b40daaf14de32f2bf752f5820ae75e6fef84ebc21ce56176fcc2f6a9214a47ea SHA512 183ad995db6fc08f3da3913f64510bfa4252c31e8478a19738bb6b421c66555db452a8d77243a5ba8e97e0dd6fdda2b47f29f2fd01abac26b114aaa3b8856f4c
EBUILD mariadb-10.2.31-r1.ebuild 34996 BLAKE2B 5afbfd085d07291e4e4d92e3d5023fbfc214cebd8075299d122abb929271fa88a3ff635d7b534ee023bd1c2c994251fbdd4fb91cdd195a55333361b5c248d347 SHA512 49224247f852201a0d6df85ecd90f37e5e3b62d3e8b355be003ce998e6aed8a672a3dd2cc302462da5aaf99979feae90d9d9ebc1f6298826b41193bcff354ad0
-EBUILD mariadb-10.2.32.ebuild 33627 BLAKE2B 9b2c680e69fe4b557898431350d742b8ee443b4628159a834c9ab803cff9a825b5425d0ee22afb1e4701074bb584857625868710d0624a19fa5b67dff5a9c437 SHA512 a3127a21336e63e3471f3de8196a6a2f8f0814242eaaa49102a337d86c208fdafcced1d28faf28e24fcb0beefc18c4b4ca9fa4c6fff4d5628e0ec56b39d039b7
+EBUILD mariadb-10.2.32.ebuild 33626 BLAKE2B 5e1cad69de12feb40175b646937269fe2214deca9703d65982b66379ae25812aa161c26a94cb274dc7ba29660ce53654e70649be19c9668e31db92d8f5c073fa SHA512 f453ab971b2cad1c99855af17c72769f55c22f398e5d5abc0301919fd7acd3fd4ef57aea2c7917b470da18c04c2a4bc52a4fea10bf3aa348d3d30ba67a7dbec9
EBUILD mariadb-10.3.20.ebuild 32690 BLAKE2B 35f9eb05a31fa3949464a77b044dc00561c016572a88fc028cb9ff58a1c149db72cd09d9cb0e1cb9e64b055881940adec0bcf990b3cbaa1bf9fb26a3d066ceda SHA512 861f3608796ab075c052e623cb8949adcea2bf49c97e81b70f9236ca8f67d6ca32602c7946f556763b7f421d275845c896f74db8e5ac966a387ccbcc69c29afd
EBUILD mariadb-10.3.22-r1.ebuild 34771 BLAKE2B c8dca58770e27fce52ed0b492968334cbdf6bc7e6f691dd610a39cfab5261eccd467afa8a832388140d584349db7ce5668c5c0b13a4080f0b8bbe26a077a74b8 SHA512 e860dd7b60b5f6ce5dca20915364fd94f17c0fb80cf1afdd4b791f3c2454cb7240a7bebf91a8fcb4c52a6f5c71d1bec95436b0f662656d2b97387fc1de7ac6ee
-EBUILD mariadb-10.3.23.ebuild 33404 BLAKE2B 5834e850437812705f7fefb9174033bf03dca2cbc7aa88faa79655b051ada65975585d855124441501cf49ffc45097d6e7787a59d6ab74afe7da706928b8189e SHA512 f7f2a4aa95086f4a2dad9626596f704d8c7bdcfe16635f49fa9ad416c06ccc898d5fa67ba81c8edb8c5a3f434eecb9b18e2bc1e12a0bc4f8d8e47a840f86a1a9
+EBUILD mariadb-10.3.23.ebuild 33403 BLAKE2B 37f507bac4483b5ebae4805c5cbe5e63729d5db6263f42bfeaed8ee92720ac30af3b571a7a7ba28d23f9afc281adba20dd3b81799baafa53bf22adccb070eb73 SHA512 74623db1a7320e3f799ea88321829d5148591e1f1fd5313108fe744b720e02c8f056ec2990544b7dfa428e3e6706150e91dfeb52c0790b718d8a3145b26acec0
EBUILD mariadb-10.4.10.ebuild 33342 BLAKE2B 8aa25f71b60b596994749905a9af6d0171a259bafba7ab76ff68e855d97de0363a687d4c603fe2ffb1d14196ff51ab5e8706c05d2c2a0dfdcb8f801001b1e0bf SHA512 ac6dcded63450f4a83e1bc41fd5a881bfe7f712cc4e31270d2d1b3015dd48e4a79876acc359e6bd6fd6f1c560a281fad96f4369965d9734b88165a27a5a1a70b
EBUILD mariadb-10.4.12.ebuild 35329 BLAKE2B 88641f83a0e7e7617834b5bf27249e9ea863eb933be1b04389e4da0af004540f6c1472eb04dc98e4b51a89d81fbb651a88839db514adbf137169a315075fbfcd SHA512 647a0e6651ee8ca4f61bde0a88e9e2de4c3f06f10a7bcc0ce8bf940de830051025c89fa3428f154b14e58c050bf1dccf525804cccb73cdbabe265bf62dd9b595
-EBUILD mariadb-10.4.13.ebuild 33969 BLAKE2B aa7c9f6440a98314f4db6ef6cd3d94b2920c9c7802e7495c1447a3dfc580971de53801ad03e453342ff41a170d383dcf112b4d1d647a603dcfbd2a417f240204 SHA512 9f44d71a2346de4b09b45ec8abeda84679acce9b818e89c1a558067f26a8a57a81ce0f0c2e0012aaa1e6e8bc8272d3769663e819310f31eaf2dff28665dc1041
+EBUILD mariadb-10.4.13.ebuild 33968 BLAKE2B bb4aa981aa8b11c0dabb71513efae2405845a0f2b33127f510a024e5b8fcf8f187e440aede225199965789337fe48d4617fe31141019fe8dbecb9edad22d6a29 SHA512 a04e4e2f6b4ebc2dc0c5f073823aa830b2adb2fe97e6b95dbb77ad15a712b842e6252d15ae7bb084d681d27518bd8ce347e82d5af8d78616129527b817516110
EBUILD mariadb-5.5.66.ebuild 27209 BLAKE2B 837dad98c4e35a0e1ab4be51a0452531a33479098dd6706fb2991c617ae0bdb8cbd117f6c598c2eee0a0a63f5ae0b26f7e334d223548782cb5c4a47d31f5ff2d SHA512 be93e099475ca316318db96ba5437a491993440b42c638a52a215b3cc7d66ae14595d024a65efb032e26cf85130247f242d23e659509aa2a175fb6228b30bd3b
EBUILD mariadb-5.5.67.ebuild 27209 BLAKE2B 80a419eded23bef53857b7554dc528e3196413ee9216c7341904af5d1590758a3017e006a4a67192a0fc37e6af70485f422ada200c99aa82714c08aaa9da8c01 SHA512 cdc301f9ae2cafd19919d10149a09d98f4bd9e106c521e398754e8cc1a770c3951432acec2e5ea19aed958c0233b4ec623bd28a573e085849b4dda860f35b26f
EBUILD mariadb-5.5.68.ebuild 27216 BLAKE2B 67f60b5c4547a8e656931b76a4a74b87f03c92d0fc845f9258a165b3d001465e501c5cef5b1f4d2faac3e28d5a78e0cc3ec7b4d1fc8d92cdf9d56fdeadb4a06d SHA512 2e02a02cf904cadc4648380ff3c34ce2afbc238172299b76456cb88b5a956564e9256ee5c01421716c7380dbe373f04c12cdc41b3524fc80a8e701691a7d3032
diff --git a/dev-db/mariadb/mariadb-10.1.45.ebuild b/dev-db/mariadb/mariadb-10.1.45.ebuild
index ada13d31e8b9..90bcfc0a3e0d 100644
--- a/dev-db/mariadb/mariadb-10.1.45.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.45.ebuild
@@ -34,7 +34,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
?? ( tcmalloc jemalloc )
static? ( yassl !pam )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.2.32.ebuild b/dev-db/mariadb/mariadb-10.2.32.ebuild
index 1b2e46a6c321..4efd5f7fe948 100644
--- a/dev-db/mariadb/mariadb-10.2.32.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.32.ebuild
@@ -35,7 +35,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
?? ( tcmalloc jemalloc )
static? ( yassl !pam )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.3.23.ebuild b/dev-db/mariadb/mariadb-10.3.23.ebuild
index 612ad9bf51ee..68a567c3e57a 100644
--- a/dev-db/mariadb/mariadb-10.3.23.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.23.ebuild
@@ -35,7 +35,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
?? ( tcmalloc jemalloc )
static? ( yassl !pam )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.4.13.ebuild b/dev-db/mariadb/mariadb-10.4.13.ebuild
index 69e74409ad54..dbde2aa2d74f 100644
--- a/dev-db/mariadb/mariadb-10.4.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.13.ebuild
@@ -33,7 +33,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
?? ( tcmalloc jemalloc )
static? ( yassl !pam )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index a0aef261a3a5..40c01344cd89 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,4 +1,7 @@
+AUX mycli-1.21.1-fix-test-install.patch 456 BLAKE2B 3f4eafe405a2151b1b2897ac60347a5fdce45747f927a40367943ad78ef96753ad106bdefe516b76946fa509b17a31d9423cf0b5cf311e79174ce5e4f6320428 SHA512 90c53b12baee1339cdc629615a021ff0290e6350f3358491cd163c4405d49be02340a56a73475623a6b49877cef53e3c5bd9aa93897aa91769a402e8f4c0b88a
DIST mycli-1.20.1.tar.gz 265264 BLAKE2B d00b1713132609b0a5ec6e8b78785fdab5c6b4db5937bc0b9bc69ddde90ad3dc75aeb99ccf6b5e7fe5e78e9bf4819f03fb454825e5182bc5d2c44356032343d1 SHA512 82ee642b2a4c158b0e2ea275941650125e15004ec1c70b2ab90ae0825090efccb4910a14fd46bcdf795a74adba5689b46de5668447308de63d1cbbbe2e6b0e9d
+DIST mycli-1.21.1.tar.gz 267646 BLAKE2B e0678974949ae219236b89fbe9ebdacfee9c1efc8f92853c937150dbb841680664432e9f5c79181545df8b3321480cf784e45a83139351cc93256d26dcdd66f0 SHA512 beb3888ff8abc2a79e591516d7f0f76d0c18f186bd0dca3b4aadcf93b3045de53ac7f135553ad509273c85ea364e81df5dcadf9eacf1dbef8ceff7345aa5ed6d
EBUILD mycli-1.20.1.ebuild 1285 BLAKE2B fea26ada4e62c0d97237d8e28076d7ce4ccd818e6e3c38b32c6f4b36c35b0e4bebda5d53972120306a6f14d8d30aec13f4ecc4967b2871a154014a7621a2e034 SHA512 a85982ab2b7751ed4e2fe180920fb3edf8118cbabe37b255e689b6e40c9350d5674109c4d6dc4447b7e7cc295fc8c2e51e05d336464fcb3b8b48801964837b11
-EBUILD mycli-9999.ebuild 1265 BLAKE2B 697f31b84b19e2630147a5e354bf183e720d86d56ea8bd108c57b165f287003575d9433d2ec02aaef454eb04df8721589277d3ac8b277154f982bbbc6ef0d921 SHA512 9dd324eb4e345fe079a81b6a2720e1ad5a6048448d2fdb9b2561946b6ef48835a7a98650bd82f2dbc925181631e5d03db6dfefea0a273037b953c4b0fe37060c
+EBUILD mycli-1.21.1-r1.ebuild 1579 BLAKE2B 374463b3c1671a25868ef4cf0e58496e0c15912088b225518eb8d36cb009b12245dcab81e7c9e92a6fd1a924eee6e979a4999f3169ec73aeb918d64a393e732a SHA512 e1ed0950ee2bd525623c59e8a4b2e7abc96baec3ce0bf400ee8dd26075da2b622ba6f628ecbc4e649abbe54af588477312feba6b2beed7521ca8c37feee2fb2b
+EBUILD mycli-9999.ebuild 1560 BLAKE2B 624da8139f363002c3ffd6f045a349cec30a7e3d8917bf4b2a482969eaf8b594da7996f7f164ac1883ce44819e67733fc9ac6e91e8f3a3c8a95a28caa879fcfc SHA512 84f246aba80728a62e11267ea415c00e898a3ac1041eaa8508f05672f029157cf459e2199a25ce104aa8cbbd16e1f36560046e3381f42a2e89f1166b15f3dfcd
MISC metadata.xml 406 BLAKE2B d46b17f9f36fc9851f36d4deadf52ca52d6df621245e521f66386ff3deed3b863188875dd2207c3cf78474cd8a04aebf03dad6564251581b8f9d09fb7bdf5ba8 SHA512 b88e9469cfd9287df46b84c62b27fd60f3cf84abfe93aba4ca7b46d668b0ed855c17ccccd95a49bc102bc2d9c054846ff33e094fe0351c598a9b55f494618e57
diff --git a/dev-db/mycli/files/mycli-1.21.1-fix-test-install.patch b/dev-db/mycli/files/mycli-1.21.1-fix-test-install.patch
new file mode 100644
index 000000000000..7c802a803337
--- /dev/null
+++ b/dev-db/mycli/files/mycli-1.21.1-fix-test-install.patch
@@ -0,0 +1,11 @@
+--- a/setup.py 2020-04-19 16:15:15.000000000 -0400
++++ b/setup.py 2020-07-07 13:56:25.181039348 -0400
+@@ -85,7 +85,7 @@
+ author_email='mycli-dev@googlegroups.com',
+ version=version,
+ url='http://mycli.net',
+- packages=find_packages(),
++ packages=find_packages(exclude=["*.test","*.test.*","test.*","test"]),
+ package_data={'mycli': ['myclirc', 'AUTHORS', 'SPONSORS']},
+ description=description,
+ long_description=description,
diff --git a/dev-db/mycli/mycli-1.21.1-r1.ebuild b/dev-db/mycli/mycli-1.21.1-r1.ebuild
new file mode 100644
index 000000000000..042db5617483
--- /dev/null
+++ b/dev-db/mycli/mycli-1.21.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
+
+HOMEPAGE="https://www.mycli.net"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssh test"
+RESTRICT="!test? ( test )"
+RDEPEND="$(python_gen_cond_dep '
+ >=dev-python/cli_helpers-1.1.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/click-7.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/configobj-5.0.6[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/cryptography-1.0.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/prompt_toolkit-2.0.6[${PYTHON_MULTI_USEDEP}]
+ =dev-python/pygments-2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pymysql-0.9.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}]
+ =dev-python/cli_helpers-1.1.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/click-7.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/configobj-5.0.6[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/cryptography-1.0.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/prompt_toolkit-3.0.0[${PYTHON_MULTI_USEDEP}]
+ =dev-python/pygments-2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pymysql-0.9.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}]
+ [QUIT] )
++# This macro is a combination of OPTION() and FIND_PACKAGE(), it
++# works like FIND_PACKAGE(), but additionally it automatically creates
++# an option name WITH_, which can be disabled via the cmake GUI.
++# or via -DWITH_=OFF
++# The standard _FOUND variables can be used in the same way
++# as when using the normal FIND_PACKAGE()
++
++# Copyright (c) 2006, Alexander Neundorf,
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++
++macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
++ option(WITH_${_name} "Search for ${_name} package" ON)
++ if (WITH_${_name})
++ find_package(${_name} ${ARGN})
++ else (WITH_${_name})
++ set(${_name}_FOUND)
++ set(${_name}_INCLUDE_DIR)
++ set(${_name}_INCLUDES)
++ set(${_name}_LIBRARY)
++ set(${_name}_LIBRARIES)
++ endif (WITH_${_name})
++endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
++
+--- OpenSceneGraph-3.5.5/CMakeModules/OsgMacroUtils.cmake
++++ OpenSceneGraph-3.5.5/CMakeModules/OsgMacroUtils.cmake
+@@ -463,7 +463,7 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
+ IF(APPLE)
+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )
+ ELSE(APPLE)
+- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
++ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
+ IF(MSVC)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS RelWithDebInfo)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS Debug)
+
+--- OpenSceneGraph-3.4.0/examples/osgviewerFLTK/CMakeLists.txt
++++ OpenSceneGraph-3.4.0/examples/osgviewerFLTK/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ SET(TARGET_SRC osgviewerFLTK.cpp )
+
+-SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_LIBRARY} ${FLTK_GL_LIBRARY})
++SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY})
+
+ INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} )
+
diff --git a/dev-games/openscenegraph-openmw/files/openscenegraph-3.5.1-jpeg-9.patch b/dev-games/openscenegraph-openmw/files/openscenegraph-3.5.1-jpeg-9.patch
new file mode 100644
index 000000000000..f6e85e8e352d
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/files/openscenegraph-3.5.1-jpeg-9.patch
@@ -0,0 +1,34 @@
+From 34b4e7001522c1b47b4211dac34d2d6a6b994a6f Mon Sep 17 00:00:00 2001
+From: Robert Osfield
+Date: Thu, 17 Aug 2017 10:52:59 +0100
+Subject: [PATCH] Added version check for boolean, TRUE and FALSE settings
+
+---
+ src/osgPlugins/jpeg/ReaderWriterJPEG.cpp | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
+index 9f7f4c38937..115203322a5 100644
+--- a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
++++ b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
+@@ -70,12 +70,14 @@ namespace osgDBJPEG
+
+ static int jpegerror = ERR_NO_ERROR;
+
+-/* Some versions of jmorecfg.h define boolean, some don't...
+- Those that do also define HAVE_BOOLEAN, so we can guard using that. */
+-#ifndef HAVE_BOOLEAN
+- typedef int boolean;
+- #define FALSE 0
+- #define TRUE 1
++#if JPEG_LIB_VERSION < 90
++ /* Some versions of jmorecfg.h define boolean, some don't...
++ Those that do also define HAVE_BOOLEAN, so we can guard using that. */
++ #ifndef HAVE_BOOLEAN
++ typedef int boolean;
++ #define FALSE 0
++ #define TRUE 1
++ #endif
+ #endif
+
+ /* CODE FOR READING/WRITING JPEG FROM STREAMS
diff --git a/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.3-docdir.patch b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.3-docdir.patch
new file mode 100644
index 000000000000..75dd48b30687
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.3-docdir.patch
@@ -0,0 +1,73 @@
+From 1dfc0e3218e15b94f7b145c8f5b2bf61974b9573 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 23 Dec 2018 22:10:49 +0100
+Subject: [PATCH 1/2] Add GNUInstallDirs for standard installation directories
+
+Distributions are given standard variables for already existing hooks.
+Multiarch libdirs is taken care of automagically.
+Raises minimum cmake version by a little (2.8.5 is enough).
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 064d4e289..777265e0e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,7 +13,7 @@ SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
+ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5 FATAL_ERROR)
+
+ if(COMMAND cmake_policy)
+ # Works around warnings libraries linked against that don't
+@@ -767,6 +767,7 @@ ELSE()
+ # FIND_PACKAGE(PythonLibs)
+ ENDIF()
+
++INCLUDE(GNUInstallDirs)
+ # Include macro utilities here
+ INCLUDE(OsgMacroUtils)
+
+--
+2.20.1
+
+
+From d2be900de7b5fb4e23d9429c02269f671962c670 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 23 Dec 2018 22:12:33 +0100
+Subject: [PATCH 2/2] Replace OPENJPEG_INSTALL_DOC_DIR with
+ CMAKE_INSTALL_DOCDIR
+
+This changes the default doc installdir to DATAROOTDIR/doc/PROJECT_NAME
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 777265e0e..e1ed1bd51 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1180,7 +1180,7 @@ IF(BUILD_DOCUMENTATION)
+ ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
+ )
+ #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
++ INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT openscenegraph-doc)
+
+ # now set up openthreads documentation generation
+ IF(BUILD_REF_DOCS_TAGFILE)
+@@ -1196,7 +1196,7 @@ IF(BUILD_DOCUMENTATION)
+ ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
+ )
+ #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
++ INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT openthreads-doc)
+
+ # Process our other doxyfiles but don't create targets for these
+ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
+--
+2.20.1
+
diff --git a/dev-games/openscenegraph-openmw/metadata.xml b/dev-games/openscenegraph-openmw/metadata.xml
new file mode 100644
index 000000000000..bc586e1a8125
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/metadata.xml
@@ -0,0 +1,28 @@
+
+
+
+
+ alexey+gentoo@asokolov.org
+ Alexey Sokolov
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ games@gentoo.org
+ Gentoo Games Project
+
+
+ OpenSceneGraph on steroids. This fork was created to experiment with performance enhancements for OpenMW that are too controversial to be included in the general purpose OSG project - either for design reasons or backward compatibility reasons. OpenMW still works with "vanilla" OpenSceneGraph, but it is recommended to use the fork for better performance (around 10-15% on most devices). Note that the improvements are very specific to OpenMW and its animation code in particular; other OpenSceneGraph applications are not likely to see the same speed-up, or any speed-up at all if they are already GPU limited.
+
+
+
diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425.ebuild
new file mode 100644
index 000000000000..fe26f799c8c5
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake flag-o-matic wxwidgets
+
+DESCRIPTION="OpenMW-specific fork of OpenSceneGraph"
+HOMEPAGE="https://github.com/OpenMW/osg"
+MY_COMMIT="8b07809fa674ecffe77338aaea2e223b3aadff0e"
+SRC_URI="https://github.com/OpenMW/osg/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/osg-${MY_COMMIT}"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0/132" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
+KEYWORDS="~amd64 ~x86"
+IUSE="curl debug doc examples egl ffmpeg fltk fox gdal gif glut gstreamer jpeg
+ lua openexr openinventor osgapps pdf png qt5 sdl sdl2 svg tiff
+ truetype vnc wxwidgets xine xrandr zlib"
+
+REQUIRED_USE="
+ sdl2? ( sdl )
+ openexr? ( zlib )
+"
+
+# TODO: COLLADA, FBX, GTA, OpenVRML, Performer, DCMTK
+BDEPEND="
+ app-arch/unzip
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+RDEPEND="
+ !dev-games/openscenegraph
+ media-libs/mesa[egl?]
+ virtual/glu
+ virtual/opengl
+ x11-libs/libSM
+ x11-libs/libXext
+ curl? ( net-misc/curl )
+ examples? (
+ fltk? ( x11-libs/fltk:1[opengl] )
+ fox? ( x11-libs/fox:1.6[opengl] )
+ glut? ( media-libs/freeglut )
+ sdl2? ( media-libs/libsdl2 )
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
+ )
+ ffmpeg? ( media-video/ffmpeg:0= )
+ gdal? ( sci-libs/gdal:= )
+ gif? ( media-libs/giflib:= )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ jpeg? ( virtual/jpeg:0 )
+ lua? ( >=dev-lang/lua-5.1.5:* )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr:=
+ )
+ openinventor? ( media-libs/coin )
+ pdf? ( app-text/poppler[cairo] )
+ png? ( media-libs/libpng:0= )
+ qt5? (
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ )
+ sdl? ( media-libs/libsdl )
+ svg? (
+ gnome-base/librsvg
+ x11-libs/cairo
+ )
+ tiff? ( media-libs/tiff:0 )
+ truetype? ( media-libs/freetype:2 )
+ vnc? ( net-libs/libvncserver )
+ xrandr? ( x11-libs/libXrandr )
+ zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+"
+
+PATCHES=(
+ "${FILESDIR}"/openscenegraph-3.4-cmake.patch
+ "${FILESDIR}"/openscenegraph-3.5.1-jpeg-9.patch
+ "${FILESDIR}"/openscenegraph-3.6.3-docdir.patch
+)
+
+src_prepare() {
+ sed -i "s/ FIND_PACKAGE/ MACRO_OPTIONAL_FIND_PACKAGE/g" CMakeLists.txt || die "can't replace FIND_PACKAGE"
+ cmake_src_prepare
+}
+
+src_configure() {
+ if use examples && use wxwidgets; then
+ setup-wxwidgets
+ fi
+
+ # Needed by FFmpeg
+ append-cppflags -D__STDC_CONSTANT_MACROS
+
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ -DDYNAMIC_OPENSCENEGRAPH=ON
+ -DLIB_POSTFIX=${libdir/lib}
+ -DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
+ -DOSG_PROVIDE_READFILE=ON
+ -DOSG_USE_LOCAL_LUA_SOURCE=OFF
+ -DWITH_Lua51=OFF # We use CMake-version FindLua52.cmake instead which can find any lua
+ -DWITH_Lua52=$(usex lua)
+ -DWITH_Asio=OFF # Fails to build, similar to https://github.com/chriskohlhoff/asio/issues/316
+ -DWITH_CURL=$(usex curl)
+ -DBUILD_DOCUMENTATION=$(usex doc)
+ -DBUILD_OSG_APPLICATIONS=$(usex osgapps)
+ -DBUILD_OSG_EXAMPLES=$(usex examples)
+ -DWITH_FFmpeg=$(usex ffmpeg)
+ -DWITH_GDAL=$(usex gdal)
+ -DWITH_GIFLIB=$(usex gif)
+ -DWITH_GStreamer=$(usex gstreamer)
+ -DWITH_GLIB=$(usex gstreamer)
+ -DWITH_GtkGl=OFF
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_Jasper=OFF
+ -DWITH_LIBLAS=OFF # dep failed to build https://bugs.gentoo.org/725938
+ -DWITH_OpenEXR=$(usex openexr)
+ -DWITH_Inventor=$(usex openinventor)
+ -DWITH_Poppler-glib=$(usex pdf)
+ -DWITH_PNG=$(usex png)
+ -DWITH_SDL=$(usex sdl)
+ -DWITH_SDL2=$(usex sdl2)
+ -DWITH_RSVG=$(usex svg rsvg)
+ -DWITH_TIFF=$(usex tiff)
+ -DWITH_Freetype=$(usex truetype)
+ -DWITH_LibVNCServer=$(usex vnc)
+ -DWITH_Xine=$(usex xine)
+ -DOSGVIEWER_USE_XRANDR=$(usex xrandr)
+ -DWITH_ZLIB=$(usex zlib)
+ -DOSG_USE_QT=$(usex qt5)
+ -DDESIRED_QT_VERSION=5
+ )
+ if use examples; then
+ mycmakeargs+=(
+ -DWITH_FLTK=$(usex fltk)
+ -DWITH_FOX=$(usex fox)
+ -DWITH_GLUT=$(usex glut)
+ -DWITH_wxWidgets=$(usex wxwidgets)
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && cmake_src_compile doc_openscenegraph doc_openthreads
+}
diff --git a/dev-games/recastnavigation/Manifest b/dev-games/recastnavigation/Manifest
new file mode 100644
index 000000000000..774a040d724e
--- /dev/null
+++ b/dev-games/recastnavigation/Manifest
@@ -0,0 +1,4 @@
+AUX recastnavigation-1.5.1_p20200511-install.patch 4029 BLAKE2B 7167a92f5763887f073110f04e0965745ff2114579d8a35c5c7c2480f3787aec3929f83b443e585852d268891fa279a91577a73b3bdebee0aee9c10a66afdd7f SHA512 da2c1bf75328729ef9679e2ac6cd9446b7b950ece6b6f343c0e015cc872c1e69e9fd27c9a6781a62cf6f8c845b82133d4df4ccefde8cbc3983258896d346ffc4
+DIST recastnavigation-1.5.1_p20200511.tar.gz 1541540 BLAKE2B 3878294247e26421c33019c05a8d70f9ae04ce046d1e503b2df8297e5c390c592e0222c445c9a7798c2e3eb7090b6c32d18b94015dce0a248ab17198d3054dda SHA512 bc48d9195c1ce4422359d850ad422e53c2599ff575b8c7a0ce6b7dc42720d7edd99781a1efa7bee49a00cd4ce6734f34ce9d434421471cb0cbf8e5207bbebebc
+EBUILD recastnavigation-1.5.1_p20200511.ebuild 811 BLAKE2B a5ba8c158dadc09cc59c53504d425696a2665fe5e529c05d833499c56f3f6abc78d1fa8cec56e5cad475934c676ff53510d771defd2d955878a8f2898dfca03b SHA512 0c9d9be8c118a5ee78b1d2429c52a2dcaf4249877518f714fe350d3b375ab37a622dd9723fdcdc989f0a13d9e244528b15bb2948508552886cbea82730ac38a0
+MISC metadata.xml 487 BLAKE2B f05f7dfccc42f908aa0d3e886bbe5a631e08d6e33babe10e1a5844cd48930c481873c843b8954926413334e8887c6d392412821ed173036a25349ae25afb8948 SHA512 54a6c615a69a2ba3e482e7ce37d556afa7bca8fa68cff67919aed151eb84ea38496a5a439c333ac1699db0085990f4a1d5ea221ec18997a7fcc93b9442d896d0
diff --git a/dev-games/recastnavigation/files/recastnavigation-1.5.1_p20200511-install.patch b/dev-games/recastnavigation/files/recastnavigation-1.5.1_p20200511-install.patch
new file mode 100644
index 000000000000..8017517b448a
--- /dev/null
+++ b/dev-games/recastnavigation/files/recastnavigation-1.5.1_p20200511-install.patch
@@ -0,0 +1,115 @@
+https://github.com/recastnavigation/recastnavigation/pull/437
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d23859d..54a38d8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,8 @@ option(RECASTNAVIGATION_TESTS "Build tests" ON)
+ option(RECASTNAVIGATION_EXAMPLES "Build examples" ON)
+ option(RECASTNAVIGATION_STATIC "Build static libraries" ON)
+
++include(GNUInstallDirs)
++
+ add_subdirectory(DebugUtils)
+ add_subdirectory(Detour)
+ add_subdirectory(DetourCrowd)
+diff --git a/DebugUtils/CMakeLists.txt b/DebugUtils/CMakeLists.txt
+index 8b6a3fc..86cfe76 100644
+--- a/DebugUtils/CMakeLists.txt
++++ b/DebugUtils/CMakeLists.txt
+@@ -26,10 +26,10 @@ set_target_properties(DebugUtils PROPERTIES
+ )
+
+ install(TARGETS DebugUtils
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ COMPONENT library
+ )
+
+ file(GLOB INCLUDES Include/*.h)
+-install(FILES ${INCLUDES} DESTINATION include)
++install(FILES ${INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
+diff --git a/Detour/CMakeLists.txt b/Detour/CMakeLists.txt
+index de88111..b4c457a 100644
+--- a/Detour/CMakeLists.txt
++++ b/Detour/CMakeLists.txt
+@@ -20,10 +20,10 @@ set_target_properties(Detour PROPERTIES
+ )
+
+ install(TARGETS Detour
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ COMPONENT library
+ )
+
+ file(GLOB INCLUDES Include/*.h)
+-install(FILES ${INCLUDES} DESTINATION include)
++install(FILES ${INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
+diff --git a/DetourCrowd/CMakeLists.txt b/DetourCrowd/CMakeLists.txt
+index 73cdf7c..7d1ace3 100644
+--- a/DetourCrowd/CMakeLists.txt
++++ b/DetourCrowd/CMakeLists.txt
+@@ -24,10 +24,10 @@ set_target_properties(DetourCrowd PROPERTIES
+ )
+
+ install(TARGETS DetourCrowd
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ COMPONENT library
+ )
+
+ file(GLOB INCLUDES Include/*.h)
+-install(FILES ${INCLUDES} DESTINATION include)
++install(FILES ${INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
+diff --git a/DetourTileCache/CMakeLists.txt b/DetourTileCache/CMakeLists.txt
+index 121b8ed..141a680 100644
+--- a/DetourTileCache/CMakeLists.txt
++++ b/DetourTileCache/CMakeLists.txt
+@@ -25,10 +25,10 @@ set_target_properties(DetourTileCache PROPERTIES
+
+
+ install(TARGETS DetourTileCache
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ COMPONENT library
+ )
+
+ file(GLOB INCLUDES Include/*.h)
+-install(FILES ${INCLUDES} DESTINATION include)
++install(FILES ${INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
+diff --git a/Recast/CMakeLists.txt b/Recast/CMakeLists.txt
+index 5e84376..3b04742 100644
+--- a/Recast/CMakeLists.txt
++++ b/Recast/CMakeLists.txt
+@@ -20,10 +20,10 @@ set_target_properties(Recast PROPERTIES
+ )
+
+ install(TARGETS Recast
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ COMPONENT library
+ )
+
+ file(GLOB INCLUDES Include/*.h)
+-install(FILES ${INCLUDES} DESTINATION include)
++install(FILES ${INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
+diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
+index 7c17469..a98ccbf 100644
+--- a/Tests/CMakeLists.txt
++++ b/Tests/CMakeLists.txt
+@@ -8,5 +8,3 @@ add_executable(Tests ${TESTS_SOURCES})
+ add_dependencies(Tests Recast Detour)
+ target_link_libraries(Tests Recast Detour)
+ add_test(Tests Tests)
+-
+-install(TARGETS Tests RUNTIME DESTINATION bin)
diff --git a/dev-games/recastnavigation/metadata.xml b/dev-games/recastnavigation/metadata.xml
new file mode 100644
index 000000000000..476961fc1b94
--- /dev/null
+++ b/dev-games/recastnavigation/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ alexey+gentoo@asokolov.org
+ Alexey Sokolov
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ games@gentoo.org
+ Gentoo Games Project
+
+
diff --git a/dev-games/recastnavigation/recastnavigation-1.5.1_p20200511.ebuild b/dev-games/recastnavigation/recastnavigation-1.5.1_p20200511.ebuild
new file mode 100644
index 000000000000..ca12783c1d9f
--- /dev/null
+++ b/dev-games/recastnavigation/recastnavigation-1.5.1_p20200511.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Navigation mesh construction toolset for games"
+HOMEPAGE="https://github.com/recastnavigation/recastnavigation"
+MY_COMMIT="df27e4eb1a4ade9912f8b7d75c25769a3193dbd0"
+SRC_URI="https://github.com/recastnavigation/recastnavigation/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/recastnavigation-1.5.1_p20200511-install.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DRECASTNAVIGATION_DEMO=OFF
+ -DRECASTNAVIGATION_EXAMPLES=OFF
+ -DRECASTNAVIGATION_STATIC=OFF
+ -DRECASTNAVIGATION_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 58907627768a..8d9aba9d6683 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 24b65d80d90b..a740d70455cb 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -3,5 +3,5 @@ AUX java-config-2.2.0-py38.patch 1685 BLAKE2B 3fe59a1839a9fe1f954e6c96bdf42bd28f
DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
EBUILD java-config-2.2.0-r4.ebuild 1063 BLAKE2B ad07cf002078f3adba19c4c59d00f084640349d64a728758bfe968eedd372e3a6e47ef0ef9b45751ec9a51c17851c764e6edd5a1d6ccf063fbc2beae25165f52 SHA512 e2976feaf12b9e208f39b33457e72a410bc74844e1ac283efefb989d0028083c6c663f96b5eb1ac15c2b13214dfe18b44c1f8621bf2ed6b82ec1ac58713825b2
-EBUILD java-config-2.3.1.ebuild 978 BLAKE2B 1253818128fa800d5249d561e90c339eafe20c1c4554a6dc77b0a264efaddcbcb0be7a25cae03a9cde2e45a84cfd888215eb3d3fb44b5a1cdee74a57c814e414 SHA512 a5c9b1847609d9f835610fe756cc09592e96a410517fbd6a5429df18875025c2ec678b574a41453a910a7903b534487cc9c90d3c72c35c604d3cd4cc8f49e0c6
+EBUILD java-config-2.3.1.ebuild 977 BLAKE2B 7d64a9145f01bc7d1503b3a298b2bf70c4fe2aeb9b8bc0b6880f3733b664bd2791292bd7aeb1301c825d962c5596e976a3c5aefb25bb3df0d57d5f85ea2245e5 SHA512 cecb6e7434838fdf43c835ea73afd83707ef2dd1820eee5ec9ac1e2c28ffb3d023500a82244d440f5f8a856225fac01b756207d1e1d1bc73db7e80186fff662d
MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild b/dev-java/java-config/java-config-2.3.1.ebuild
index 8f719c63474c..87732bf9ecf0 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 7bc7066cf23e..9a559343bd28 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -9,15 +9,19 @@ DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
DIST apache-tomcat-7.0.103-src.tar.gz 5279592 BLAKE2B a8ab36fb84cf158fcd8b888276576cd523d211ab0f6fe0933f600d1990a8f68076f192177a574987e52440037c0ebefd3edaf3c84fee541afb076c5ad33cce9b SHA512 812fce83c7242ebc16dc2365f0b363f1fb2691cd6a2f19f1209ea467557c42ee2d108c8bef89f23bb4a20c800d0ecdb4afc37567ef8079966b4eec0331a2ef9b
DIST apache-tomcat-7.0.104-src.tar.gz 5309794 BLAKE2B 0d4d5d668e1131bb533af1d56fe37ee1f5c252c2c4dd987e24aae67484f27805f88750b27248c6acfd0585eacd0d3f2155c723e9a25c8613652101944add2a15 SHA512 788eab3ac343815362decf4c0d5db91f3697cc669e7e051f93bf82905cc52f9b040d00b7e07f7b85bcf470e802418896a678f991e523e08a3ae5a2f212a53257
+DIST apache-tomcat-7.0.105-src.tar.gz 5312024 BLAKE2B 0eaad66c6dcc3e2f6a2d8e142a7832cbd413724cab8b10f00e87d5535f4f20d5ba4712794e09444a8b3e0cf23f036da7c6923f038a6a11714682b129ed4ac5dd SHA512 249e039775e833d75b631cec26132b42e4aed25491a29f2349fa41b81737688b0a2e453072d8e3c5fc28763a9d1922f59da7529378ce8fd472eca7bbc73a6bd2
DIST apache-tomcat-8.5.56-src.tar.gz 5724546 BLAKE2B 623dc2d1f6808f012f19fdd0d914c4bb200e8328ab6b6855666c1db1704e198d069ff74d227bf51e8376c20daf0640002e5d6907edadfde294d8c62a64d55f83 SHA512 75529e567a7be48f2c1034f3eeada571478d0babb63fb2d368061573d7e64d5fc0a937304e2e2ffa956b5d8a403936c1543a93ee78b258b532939fb9ce80ef3d
DIST apache-tomcat-8.5.57-src.tar.gz 5730658 BLAKE2B f9bd2e159abc6af62c8681c38ea4eae8155f95df11f7c244e45018929189ef6b6a37a11e84119c3ddcb134a8ab58773add19cbab7506bb87c43b0039899fde60 SHA512 8bf4334b190c36900b708ee7097097e513f2d4572f119173bee732c76b5b660350fe516e58ac867250c2ef7a1371b55c116d3a1abd18323ceb92337f1dcb0f60
DIST apache-tomcat-9.0.36-src.tar.gz 5890912 BLAKE2B 18962c7d4dcd75a04476acd306002977bf039d832aa1ed5551ffcaa0612e612e6b11db6d80cea149b9fb5df9d0f76284d55a1745760df8f4fa7449999e095c61 SHA512 f8263594bc679f75cecf5bcf4ad8e8ccfea42ad8e90eaeb7004c63875c6b700b0f863d68f1cdd932ebc7b303bdfb86d70afe88686e576c8ea7ccd9574c74e25b
+DIST apache-tomcat-9.0.37-src.tar.gz 5894559 BLAKE2B 63148418ef96e90f212ce8a00dc6a274a8da2a1aa8a53ad0f6d3960efc8e876dd2812f425c0f21c73ee291752c5fd3bc8025eed46d18d31ae72e8bbe6dc1ba10 SHA512 6e819fe255c467b0081e91c17a53fa383fe84d922492c62d7dd93cabf00e22ab30872ecaa298a9b12977b8c7518f36c8429091b24c9fb5200db64e80e853ce98
EBUILD tomcat-servlet-api-4.1.40.ebuild 996 BLAKE2B 0820bfc92a49246c9d35774e8efcb02eb64a7a98b1276c847bdd42528f0331bfd9d3e8d8f4d6320667cc0fbb52552ca52fdee6735cf0ce97d6d975377061af91 SHA512 c3cca19f2a4206dd68328f6d6c902b15f6fb4a8b740dab698b8d668354f98c6fc272b19ec1df4bb7c4c65e729460b41a512d4d13ca765ee4be8879108b14766c
EBUILD tomcat-servlet-api-5.5.36.ebuild 1430 BLAKE2B 2bceaac608b1e285da260b9041596b18d5c360d9d7ff596f1b558fcddb6a4c38865ef1a384bcc98b8187e9ac4fb0ac45d57676fab2001bb7f595c6fb9080e0cc SHA512 b9745c4beb9d3ce8645c495345d7dd76fb9d930ce72c8f7387d9cc73e615b62f40a2f470b46cef407ed0b097b050413451763acb81edb0c87d0d95ffb28c9319
EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
EBUILD tomcat-servlet-api-7.0.103.ebuild 901 BLAKE2B d0ee4ec8ba0e77f5c555ce53b1dad3558371a7667e55a3991b9753e135eedd67af5627b7c819620ea5f52c741f14b53fbc1fb1a6cd0cc680f62e0d651de6b22c SHA512 57e57d722ed3ae8c3cd99c0a0351242c6c74bc556babb4719db51ace5b73ea57eb538e69ce3b19c32cb33defcd1ffbaea99bf401d856539560c0a4cc9f5bd685
EBUILD tomcat-servlet-api-7.0.104.ebuild 902 BLAKE2B 67cf14b835e7ce4ee75dc7739a31ffbc5c80d858087296ea98a1d1bc080079967350683f79d8b1db67977b9d82458a720cf7213a2ae4df8de72792fb81d3d771 SHA512 ab872c195c057c032267e3b1ac6e8093823f63d3b1e268dba9be610126b88ed0de2b3419d62ebc7379835c8cff0e109bdfa272abc777d67f70ada13daddae9a4
+EBUILD tomcat-servlet-api-7.0.105.ebuild 903 BLAKE2B f5342c001dfe97b439a9f65d8b3fd82d75a3694fa2b5ae5f5c3dcbacccde46e45d8888161eb0982dad879ae38dbd4c3709caa3f018e72bf3404a53d215d8bd90 SHA512 c586fef4373ffa73fe403216bd930cc9085216288ecf33937c4e30200f2bf2177768c6407d7750712628d3a8c712e8538c3e90e183b07c6c30707a811ed5e84d
EBUILD tomcat-servlet-api-8.5.56.ebuild 1005 BLAKE2B 81ce97c43775137f7c4760a58abe4d7a6192dded9e9cbcef8d29fa10b5cc0868740aa0683c94a349494232c64e42dfc0b09aeac3571260dcb6d8405dc233ec6e SHA512 520be8a3bb582a0b3dc783f5bc1763076d94a84a71e7678dc9d2def1d1c2be228097282667ecd9c3a5ba84b57b2403c5a446d45cfa249468932576df81e9d0ad
EBUILD tomcat-servlet-api-8.5.57.ebuild 1008 BLAKE2B 1560f356f09d29d3cfa9c0e69a4bab73a412cd2d174745164d1d0efae7760cff91f21c6692bfc90adb5eaed11c090ec11aec3b77fd7d2116a0d2dfdf0eb7f4c0 SHA512 5f9233d432a3710356b31633a42f16e1a500423f8fb8722772d0f8f18e95b435debedc3e53d4a87adcfd12989570d4682cc7308990b8ff00b4d15e696d5864b8
EBUILD tomcat-servlet-api-9.0.36.ebuild 1000 BLAKE2B cf72ff5044130696fc74a4ee7cfd28e55e82077d8972c56ce9324007e5d5776e4ed7fc4d00e10ba8c08ffdcf6fc862ecd8a86f177d41fc5264d4a1f9d110f6d4 SHA512 a72ac598d71fd597c238b4fd9d7aa6365540874cb8f1ae5aff63f6bf32d0f7f8195c9a1248d05bf2fa7d03a7d12a11e18c4641ce29b0a60939f03110c9ac454d
+EBUILD tomcat-servlet-api-9.0.37.ebuild 1001 BLAKE2B 0c3a54000bca6bac53d53bce38b3caa85dff31bcefb40f257408ad2113fba2e44b819630307492287f26984fdf5e4d88b68337c39768141b4ff17dea1d1353b6 SHA512 757be3ac0c480bacc7c03cf7bf1341189c5848b66b9eeb5520c82e67dd7b704bfbf3eb9f80f54130796b814c15e5d46b35eb4e1d2aeef02183d3b0bad1c90ca8
MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.105.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.105.ebuild
new file mode 100644
index 000000000000..c65e1f064dd7
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.105.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+ default
+
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+ rm -fR */*/build.xml ||die
+ java-pkg_clean
+
+ java-pkg-2_src_prepare
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.37.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.37.ebuild
new file mode 100644
index 000000000000..9ddac4eebd99
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.37.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+ default
+
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+ rm -fR */*/build.xml
+ einfo "Removing bundled jars and classes"
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+ java-pkg-2_src_prepare
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index f0a26aaa8d3a..fb270efabe64 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index 75aa6336291e..e8553b75e8c6 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -4,10 +4,12 @@ DIST MoarVM-2019.07.1.tar.gz 5189731 BLAKE2B 3dde716f6911fb8392346b34763439c3786
DIST MoarVM-2019.07.tar.gz 5187102 BLAKE2B a9c56453edf5b5834d33187aea6eabacac9a721e7a27471a02b82585560ffbb5bb8807ae8c738f3138c5b0453217ad101aab23bef2c8b727cd2f8a56574abfd5 SHA512 ff5370cb2c7dc4357825f02387757e36a5e03b711021c896043ba5f68e573308146a0d94c7855ec9b4860906a3b0720d316d119ca5bbda908f17d3f4f14f4999
DIST MoarVM-2019.11.tar.gz 5709053 BLAKE2B 5214a041d02fa9feebf50996460b4a73634bf69dc24edbda72d29fe3045504dde809143ba6edf57602a5207e45a02e9a69cfecd2dca0bb5922e5560dca4e5861 SHA512 d7d7d21ff0e3896b7cb869ea1298f9ff1b041b68062ac509d4571246f96985de0ad48d881f7c988e1ed470c4c5f859f36916bfd764cbc0e988c249682b0b8b41
DIST MoarVM-2020.05.tar.gz 5309065 BLAKE2B ed33f066cc16382218509dd9cf8f9f252c87a7d8bfeaf11be8ccbf4fe2337e1dd598d7f4368d4edc5fa1b7c704ee2b4dfec66ee8824465e6088ce0bdf7c8fac1 SHA512 10dd2bb8c629ac4d7804a8e64f8883617545930520c61ff34b62b29b81f827c425004bb07c8978df9620da446fa204ccb3b5c8889651e243a1fe4da28350ab66
+DIST MoarVM-2020.06.tar.gz 5325582 BLAKE2B 3cef20e2cf8d35cf4e812c2838963938a059393eddf1b87d4f2a69750b5e3eae81db76c671d3fcc137f63acd0b94ff03a6c5c3c2a772d9d9409348cfb33fe235 SHA512 5dae0abb825d8ac1620a62da44de6a0a6ddbeed6862c728b895ad5922c0142fd305f5d63bef9726490d9bab0afa603e93b0a1cfd7e61f5778dedfca0f016664c
EBUILD moarvm-2019.03-r1.ebuild 1496 BLAKE2B 89daedf8f3bc91f658d82c536306de7368a79e08187bc3692873f5e77265308673882fede98c26ec2182028b512d1eeb914be5ee86ceff296135f7028854419f SHA512 a47ae1736b6d32e77b741a7de1294849f66ecfdcb286bd7d5ad235df08c916323d73bc97fd0d0909d43b38574c2dd378c99910330258c45903b9375589b8c19b
EBUILD moarvm-2019.07-r1.ebuild 1511 BLAKE2B 2b31769db78a71dd00ce52f1f2dceab57fb11e189733f7ac619bf5b30f003155fd547acb28c96959b8257424372949b712b3f56eb1e869dd875d58b03ed702c8 SHA512 ad8929015996b9b75e7de02e1544da1a1f09f1363aae925d0ccf54e3fe9c15c376e65554fb8dfbbbfa8a3174617885949c85fde3cab129ed238751d26f16acef
EBUILD moarvm-2019.07.1-r1.ebuild 1765 BLAKE2B c961aadfb1fc6bc4cf4c73821a86f65e7f3ec82025701541bc55dcbe9449c4e7e15eed7be28992b75fad058b65d936e1248a9668e1b0619e9dc53f9306db419b SHA512 3845ff95d15475502a5c9541463d767e1e00875d53589209bb02ae24e494d6ebdfed393080935d592275a8c73e73cd2f889381298b85c93abe08089e67a41b4b
EBUILD moarvm-2019.11.ebuild 1448 BLAKE2B 55c1b80c92869613e9569be3ea8ffd094bb4566cf03657a02998c9c31823a3dc21cfe13fab1da5c5fc49a2531c5254c5e48bfc54827d49c0daccf15f7cd8e9ba SHA512 f818e3705d05afcb5bcb69cbd75da25ba2b8b4fbe951bfc13b26386eca5a77f7147de33bbf036cd3a8c44dc983c7bbe94abfd1838be05385236eeec5f413c54a
EBUILD moarvm-2020.05.ebuild 1448 BLAKE2B 55c1b80c92869613e9569be3ea8ffd094bb4566cf03657a02998c9c31823a3dc21cfe13fab1da5c5fc49a2531c5254c5e48bfc54827d49c0daccf15f7cd8e9ba SHA512 f818e3705d05afcb5bcb69cbd75da25ba2b8b4fbe951bfc13b26386eca5a77f7147de33bbf036cd3a8c44dc983c7bbe94abfd1838be05385236eeec5f413c54a
+EBUILD moarvm-2020.06.ebuild 1479 BLAKE2B 0747e04c59b54236accef01241145daaf003eb635a1284c4388582e474a5ef115b7c41d3f4dac624270f76f652b0db9c42507f5518c93dcb30340ea00faa4248 SHA512 01b215366f478a759569b7bc020b68896fb0c575a464d933759a7a6851972647408872f241f4c120c21cdab28487798e9247d3c3d62ab1cf1ee409d51438a38c
EBUILD moarvm-9999.ebuild 1765 BLAKE2B c961aadfb1fc6bc4cf4c73821a86f65e7f3ec82025701541bc55dcbe9449c4e7e15eed7be28992b75fad058b65d936e1248a9668e1b0619e9dc53f9306db419b SHA512 3845ff95d15475502a5c9541463d767e1e00875d53589209bb02ae24e494d6ebdfed393080935d592275a8c73e73cd2f889381298b85c93abe08089e67a41b4b
MISC metadata.xml 920 BLAKE2B dc15290595649a4f4c514f26cd219c3d8a97bb589fedac8cca202b64abe49f6851fe50d24f95f82c0dd61d183ed1f4091a4fb0f500e8f89a9b91dd7e932cc1ff SHA512 9250682955318d688f59e27b740e1b04095a85f036578d8fe2a2eeb31e159e34845a191734ba4997034dca80a32e29c8f4a0658b9a76ea78ff5fb4479124696b
diff --git a/dev-lang/moarvm/moarvm-2020.06.ebuild b/dev-lang/moarvm/moarvm-2020.06.ebuild
new file mode 100644
index 000000000000..96e569caebe5
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2020.06.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_PN="MoarVM"
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+ inherit git-r3
+ KEYWORDS=""
+ S="${WORKDIR}/${P}"
+else
+ SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
+HOMEPAGE="http://moarvm.org"
+LICENSE="Artistic-2"
+SLOT="0"
+
+IUSE="asan clang debug doc +jit optimize static-libs ubsan"
+
+RDEPEND="dev-libs/libatomic_ops
+ >=dev-libs/libuv-1.26
+ dev-lang/lua:=
+ dev-libs/libffi"
+DEPEND="${RDEPEND}
+ clang? ( >=sys-devel/clang-3.1 )
+ dev-lang/perl"
+
+DOCS=( CREDITS README.markdown )
+
+# Tests are conducted via nqp
+RESTRICT=test
+
+src_configure() {
+ MAKEOPTS+=" NOISY=1"
+ use doc && DOCS+=( docs/* )
+ local prefix="${EPREFIX}/usr"
+ local libdir="${EPREFIX}/usr/$(get_libdir)"
+ einfo "--prefix '${prefix}'"
+ einfo "--libdir '${libdir}'"
+ local myconfigargs=(
+ "--prefix" "${prefix}"
+ "--has-libuv"
+ "--has-libatomic_ops"
+ "--has-libffi"
+ "--libdir" "${libdir}"
+ "--compiler" "$(usex clang clang gcc)"
+ "$(usex asan --asan)"
+ "$(usex debug --debug --no-debug)"
+ "$(usex optimize --optimize= --no-optimize)"
+ "$(usex static-libs --static)"
+ "$(usex ubsan --ubsan)"
+ )
+
+ perl Configure.pl "${myconfigargs[@]}" moarshared || die
+}
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index 138eb2b8b0fb..50eff73ec844 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -2,9 +2,11 @@ DIST nqp-2019.03.official.tar.gz 3951058 BLAKE2B 237b8cc0105396fc96349a0dd34502a
DIST nqp-2019.07.1.tar.gz 3937612 BLAKE2B 71f5ddadaa70d7eeadc122ef50f90c13bf7e3a1a4262069ee8564f739e99dfb780359e1155a28f61f90dd1cc419379e366d7274c9567a4319bd841005c3a51a9 SHA512 90c9cfbc3de165ba8c0b4653a849a6faafef9e3862743c3675277c25bc4578522a97a663a4ed7529831fa0b617c7412fcfe67b3e3ff1fc5994f6c42cdf7a4bc5
DIST nqp-2019.11.tar.gz 3942494 BLAKE2B 241c4131fc94d7055b51a44b7be824fb53a00fc51370f59dcba1d92655de66e2db536c622084bf9466d9d753d5ad804411b4af07b2767ad1a4f09e065c6693f8 SHA512 3b9fea9d9c4d2ae2ca065536bcca5b483067f9e723c3a89c7e238199c0f52ea6ba23ae4429dacbd42bea69dccbbc836efe5046d1691185d5452f30912f4e6a40
DIST nqp-2020.05.tar.gz 3945402 BLAKE2B d73bb5cf5dcd2f0e0d42928fb12382428355f3c19bbcd015950c2a9e49ab73c215ce8ce21f3686283866c387823f1cbb3ba8179de8f7a66dca43afae94a45a42 SHA512 a60e9bcf9ef8d4c0492cc193893d398d0c62a114e829375ac9a7601336bc2cc820b8f486b10f8b647302d473f3e85ebd13559d4089d38ef6c95b0b7e8778c5cd
+DIST nqp-2020.06.tar.gz 3945129 BLAKE2B 0cc378bd5be89bdc8e8b1a72ae64a8d93ccd189811540fc29a72105df1024790deab649349fdc96087f2ce8f3b57eef97e0edf56ee98d7ba3c329e6d47386c46 SHA512 f9a930f7bc9197a9e79ba5f2f72009b4d7ceafe8e3cd7902eb3f04ffb264228b1fba2a826a7ab686322e611557e624c8dbc271dc9eac067a9cc482fc0c6b9460
EBUILD nqp-2019.03-r1.ebuild 3650 BLAKE2B 72dbc2d62b2338c7a6a1bc8933034e068cc20399c42a1e8975023592245d1af7949dec761c51c099c6471fe8c9e3fed8a5f86119d76c99b4667bf4636c6198ab SHA512 93ff5adc46156969c75778b189934a1f8fc929554db4a4f6c0a8ae472b5dbb883cfec4d391ba63340cb5681764821c63b6e7cd7891aafe663fc2731411b3062a
EBUILD nqp-2019.07.1.ebuild 3647 BLAKE2B 8b111db7536fd66b1d2f495e3b55fd9b52f3339ef5af061423556de7c369a7d664f5a0a744371c1a6916140d3ed58103c1ca4b0859253c025d26f9379da69616 SHA512 27426a63f0b3838023af38543a580b83e66802790743f9fa4e5b6671ee86c4510ff9808686fa62a50d457b3d633a9ed5469948888078e0c48ceb1ca52a71b78e
EBUILD nqp-2019.11.ebuild 3647 BLAKE2B 8b111db7536fd66b1d2f495e3b55fd9b52f3339ef5af061423556de7c369a7d664f5a0a744371c1a6916140d3ed58103c1ca4b0859253c025d26f9379da69616 SHA512 27426a63f0b3838023af38543a580b83e66802790743f9fa4e5b6671ee86c4510ff9808686fa62a50d457b3d633a9ed5469948888078e0c48ceb1ca52a71b78e
EBUILD nqp-2020.05.ebuild 3647 BLAKE2B 8b111db7536fd66b1d2f495e3b55fd9b52f3339ef5af061423556de7c369a7d664f5a0a744371c1a6916140d3ed58103c1ca4b0859253c025d26f9379da69616 SHA512 27426a63f0b3838023af38543a580b83e66802790743f9fa4e5b6671ee86c4510ff9808686fa62a50d457b3d633a9ed5469948888078e0c48ceb1ca52a71b78e
+EBUILD nqp-2020.06.ebuild 3647 BLAKE2B 8b111db7536fd66b1d2f495e3b55fd9b52f3339ef5af061423556de7c369a7d664f5a0a744371c1a6916140d3ed58103c1ca4b0859253c025d26f9379da69616 SHA512 27426a63f0b3838023af38543a580b83e66802790743f9fa4e5b6671ee86c4510ff9808686fa62a50d457b3d633a9ed5469948888078e0c48ceb1ca52a71b78e
EBUILD nqp-9999.ebuild 3647 BLAKE2B 8b111db7536fd66b1d2f495e3b55fd9b52f3339ef5af061423556de7c369a7d664f5a0a744371c1a6916140d3ed58103c1ca4b0859253c025d26f9379da69616 SHA512 27426a63f0b3838023af38543a580b83e66802790743f9fa4e5b6671ee86c4510ff9808686fa62a50d457b3d633a9ed5469948888078e0c48ceb1ca52a71b78e
MISC metadata.xml 634 BLAKE2B 1ef5daf7c995ddad1df4b2c7d33ecfc7a4cd146cb518314f88d58e370ede9e986bb47747b10952cf0ee6d587fe5925ba5b0086006182f3e16bd114d49e1a0f3a SHA512 a093877d22e76bbbced97c7752ed76d6aa110eb8d0676f97ae3d38ad79ab7b8ba770243b64e618b588faebf179713813fe6fc8ec7371c695c9f0979f6bce3dc0
diff --git a/dev-lang/nqp/nqp-2020.06.ebuild b/dev-lang/nqp/nqp-2020.06.ebuild
new file mode 100644
index 000000000000..c41412d388c5
--- /dev/null
+++ b/dev-lang/nqp/nqp-2020.06.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="https://rakudo.org"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+ dev-java/asm:4
+ dev-java/jline:0
+ dev-java/jna:4
+ )
+ moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
+RDEPEND="${CDEPEND}
+ java? ( >=virtual/jre-1.8 )"
+DEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}
+ clang? ( sys-devel/clang )
+ java? ( >=virtual/jdk-1.8 )
+ dev-lang/perl"
+
+pkg_pretend() {
+ if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
+ ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
+ ewarn "already being installed. So if it fails, try uninstalling both"
+ ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
+ ewarn "(see Bug #584394)"
+ fi
+}
+
+java_prepare() {
+ # Don't clean stage0 jars.
+ einfo "Cleaning upstream jars"
+ java-pkg_clean 3rdparty/
+
+ # Don't use jars we just deleted.
+ sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
+ src/vm/jvm/runners/nqp-j || die
+}
+
+src_prepare() {
+ MULTIBUILD_VARIANTS=()
+ use moar && MULTIBUILD_VARIANTS+=( moar )
+ use java && MULTIBUILD_VARIANTS+=( jvm )
+
+ multibuild_copy_sources
+
+ # This will pull in conditional java_prepare
+ default
+}
+
+nqp_configure() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ local myconfargs=(
+ "--backend=${MULTIBUILD_VARIANT}"
+ "--prefix=${EPREFIX}/usr" )
+
+ perl Configure.pl "${myconfargs[@]}" || die
+ popd || die
+}
+
+nqp_compile() {
+ if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
+ emake -j1 \
+ -C "${BUILD_DIR}" \
+ THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
+ JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+ elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+ emake -j1 \
+ -C "${BUILD_DIR}"
+ fi
+}
+
+nqp_test() {
+ emake -j1 \
+ -C "${BUILD_DIR}" \
+ test
+}
+
+nqp_install() {
+ # This is the actual reason we need multibuild.eclass.
+ # We need to distinguish the install procedure for MoarVM and JVM backends.
+ case "${MULTIBUILD_VARIANT}" in
+ moar)
+ emake \
+ DESTDIR="${ED}" \
+ -C "${BUILD_DIR}" \
+ install
+ ;;
+ jvm)
+ pushd "${BUILD_DIR}" > /dev/null || die
+ # Set JAVA_PKG_JARDEST early.
+ java-pkg_init_paths_
+
+ # Upstream sets the classpath to this location. Perhaps it's
+ # used to locate the additional libraries?
+ java-pkg_addcp "${JAVA_PKG_JARDEST}"
+
+ insinto "${JAVA_PKG_JARDEST}"
+ local jar
+
+ for jar in *.jar; do
+ if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
+ # jars for NQP itself.
+ java-pkg_dojar ${jar}
+ else
+ # jars used by NQP.
+ doins ${jar}
+ fi
+ done
+
+ # Upstream uses -Xbootclasspath/a, which is faster due to lack
+ # of verification, but gjl isn't flexible enough yet. :(
+ java-pkg_dolauncher ${PN}-j --main ${PN}
+ dosym ${PN}-j /usr/bin/${PN}
+ dobin tools/jvm/eval-client.pl
+ popd > /dev/null || die
+ ;;
+ *)
+ die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
+ ;;
+ esac
+}
+
+src_configure() {
+ multibuild_foreach_variant nqp_configure
+}
+
+src_compile() {
+ multibuild_foreach_variant nqp_compile
+}
+
+src_test() {
+ multibuild_foreach_variant nqp_test
+}
+
+src_install() {
+ multibuild_foreach_variant nqp_install
+
+ dodoc CREDITS README.pod
+ use doc && dodoc -r docs/*
+}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 4ca821bd799a..d57d98d65085 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -5,13 +5,19 @@ AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd235506
AUX php-freetype-2.9.1.patch 7667 BLAKE2B efc8f829bbad11b3e7b654d0882213ecb9aae766060d51f93446a6293a2f607339faba484c7b0b2f9318a5c5442da3c09e25aeda20dbc5e3258bf1009f8625b4 SHA512 0a06189f6fb3513cd2dcf9ddb590360475e2dd9a7aa8b13ab66c389c1ed40ce2361681f017cd3c6219f5b40a0a9d4978e57ca3ee4bacb7657db3285136fd2875
AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372bc14309a05e352b2838da32e1384b61b507fdb623c9400094aa5b637eb1a87da92c72600eff79b18b8989ef90af56a0fa SHA512 86469f657d8807f005c28fd2149770c881add8f243fdfea087956c7987277597fe400a7af23f624f26da270356604717ed9cd04771154d7cf2ffe7237972372b
DIST php-7.2.31.tar.xz 12309936 BLAKE2B fc81f41dd4ec8695029bfe1993d76b1fdfe7f16d926f57302b9e85f3acd250967db9b9f0597c47589ae553d5faaaf0266e24b5b64247e017361d991bf96cd4de SHA512 b21c504d0af2c095e4ae5a62c810af96171b927a27ea4694f59555c0d47798d61c3491a92941099cd9c978b3b0f41852ca2cf745e42ee3d9a6d107a5a884c9ee
+DIST php-7.2.32.tar.xz 12251152 BLAKE2B ae4cf19c2c61ea149b423248feef31e34fa697e60782e8a4fdf9bee430703e9bd8251e4140042148aa73dfbf4d39d215be498d1273e1c68bf52a14e4126d2e1d SHA512 47e84f9f493951b33625e149291bcde87189ecb28636809b3ec6264ed17e85f842fa40f3a53754f7bf948a5a6963f8773d35f773760c0c2bf21a9dbd0314736e
DIST php-7.3.18.tar.xz 12116280 BLAKE2B 73d82e4a22f29dbeec221ef3109592a40e559238a0093e80e8e10bcd7de64f3bd58dd6f0835ddf3d9c2323fc37d738301b07291ca11a84c70ddced172676bc20 SHA512 e626091c835f6d165ff48ae3be8ddf7a66b0a320c6d77dc98fb73235d560814c180112a9e5478a5b3b6bb01ed99a50f8025fdc3d1ef80cca59e04ac248f9b0bf
DIST php-7.3.19.tar.xz 12117968 BLAKE2B 84172d2aad901cdca97a6f4c3405d3f4f25c72053ca09ef8a5c6ef93d35b23ac3a7771ff9f2c4ddd000512fe288f3fb25b17bb023f3fed16735f0d6ea5bda790 SHA512 f37800d9e1bf808ad1099f6190965cc75781e7bf6d2c341a7143aca435abc9974a2987cbfeb8c2b35805c946218343612906fde3cc84b195c2c586945869b760
+DIST php-7.3.20.tar.xz 12118188 BLAKE2B add1e0dcc264cd12ea9ee000becb83c42b2607c0c9ae828994856a183ae94e9a580226559ccfa28dece225ad9a1c6bd4989ada08f09bbc461b33f0b1b30b12ea SHA512 4d035e7420ceb64d912a1936db5d311c06c61d09c9d4665c27fba9709fe45b30d5771bb485fb24393d9ee689a0f7ddcbc577e9ee7a7b31341b0203f1b805b886
DIST php-7.4.6.tar.xz 10284824 BLAKE2B 83bbbb536e48c6ab6ef357283d2f99a0f1825fdbb1867598514dc87cb8a7181298aa1e6d45659b7a4343fdacdacbbfec9e4cca89f85fe53c9e48696e534da710 SHA512 786634d53ed100cc7638e64ca340efdd42405c258638f3f97fcd1816d4f0c643dc8d8b2b0f60d36904343dc8c2af7f9b8e4a652ea66ec2fe324290c72bc09c13
DIST php-7.4.7.tar.xz 10286580 BLAKE2B fb297cc5847012e1d222479e00132c8838cb990a5face43620ced6fb82cabeb544c0de230e24e25ed5449b3050158e836743e514197180b40ebf240ceca45db6 SHA512 5b3ba690e610e0511675f06a10afe9edbcfa90b5b16956d22aab225cdf140b55e5a8a551e7b189d30404981c94c6921b8c4aed00102546cfa38784a719704b80
+DIST php-7.4.8.tar.xz 10282248 BLAKE2B 809f6f474ee2c013d2a344b09f710fde8566c6f7a5a78346183852ca8a89fe257e06e765ab33f4a8ee867d6bb1587bb26fb285841b47c42e2562b554798ee279 SHA512 81c26675d88377c7ae9b168e9c2bb622120deb796cb54c5c65d0b2eb6a0b6e465669b0f5345e553afe1acf86ff68c535ff9a2d2df47301b8aa6be01cdc3984c2
EBUILD php-7.2.31.ebuild 22650 BLAKE2B 85d53142d43bcd67e568a7424e731a5a2a55872dfa5f5e3ec10673e527357d26d1986c4a61dbf049e17b5a5db7b09fef77424da713953fb3153338e68a79e200 SHA512 7f0454f2dba27d443c729663a338dd0d5c746b572a3ccccde3b19a54ce2cdecda9f98ce1df5ef5c7afede8726234de3c1e1c1fce65bee95ad97ca5ec621abe97
+EBUILD php-7.2.32.ebuild 22658 BLAKE2B 653c74e5c863494440cf0b793510ceebad362844aef357c128037e6add6a0823231b662ca9806c68a7babdc6d650e2445c732b9a2bd4fcab9bcffa58c6a52693 SHA512 fe151df3f61c5b65f4e62610cc7cfb82ca1875334cf4c4917a88f68f96b05a1d6b6096dd04ad86f7a787e4a11df974814a6d5d1f20a9f8fec6feaf70405f10a3
EBUILD php-7.3.18.ebuild 22663 BLAKE2B 43f00a48372e83b81e10ddafd965d7aa3a2945c6858d75dc1fbcc4d07a51d22151b02d2e2e50cb91b1e398c77e93adf2eecaecf495453e8c15ae81a70ca323c2 SHA512 ebb57617c9e08b08b717a7458f79c246700aea64b9f407e5c52eede291c7d12a80eb4bedf50a2d7880f2cf73e36391f7db01a40c0622631d15bcdd2e0e8ab64f
EBUILD php-7.3.19.ebuild 22671 BLAKE2B 9fbccafac097a447241ed68db51ecf147059b1b55c31c829c7c40e01657916d376801096d8e273a4157435f0b489f776240114160d50c9399d4795ed9f7018d7 SHA512 a9f5c18c1b4667fa1730801877872434a5c146c34941da1a3b6348c7ec1bfbf152041e128faf8d962f77db17e2f94f704bfc67db71838d3f6ac3dfb0a846d4d5
+EBUILD php-7.3.20.ebuild 22671 BLAKE2B 9fbccafac097a447241ed68db51ecf147059b1b55c31c829c7c40e01657916d376801096d8e273a4157435f0b489f776240114160d50c9399d4795ed9f7018d7 SHA512 a9f5c18c1b4667fa1730801877872434a5c146c34941da1a3b6348c7ec1bfbf152041e128faf8d962f77db17e2f94f704bfc67db71838d3f6ac3dfb0a846d4d5
EBUILD php-7.4.6.ebuild 21374 BLAKE2B aeb27c63cff434dd9a735631bbeb29a2540546d2416aecdd636e2b6769070615ac148139a3891b708cf6528ac557080c7096dda95d75bfe3812495213126eef3 SHA512 2b67de7efc5dafefc1f95e9b7c22c60bca6b6c2c922857695a5c027929669b9a62068e19784a2059e28e91ff16ad0b47ee691785124bf99ead6dff12239fa4fd
EBUILD php-7.4.7.ebuild 21382 BLAKE2B 936caa37281c2b79d2d7550de422c32a0dbf41e2f1530aa5709dfd6a0d92f7c5c6b82ead5b14f27a314df5311dce7c726a6571ecdd9aa497812c0e9e71f397fe SHA512 380075433cbb7d639765fa6907c3006612901b051d48311cabd85d653b8e8105044f703a129b8d90bcfd48a29a8365de3053bad81d9561dafc5c5974d7420082
+EBUILD php-7.4.8.ebuild 21382 BLAKE2B 936caa37281c2b79d2d7550de422c32a0dbf41e2f1530aa5709dfd6a0d92f7c5c6b82ead5b14f27a314df5311dce7c726a6571ecdd9aa497812c0e9e71f397fe SHA512 380075433cbb7d639765fa6907c3006612901b051d48311cabd85d653b8e8105044f703a129b8d90bcfd48a29a8365de3053bad81d9561dafc5c5974d7420082
MISC metadata.xml 3216 BLAKE2B 6118c94f2ac3a2f283eb035cbbacb12343476b4ce22594a00cb7ebf063abb106a0ed5557d311127b8c1e2a53263103ded790cd12d20c6b410ab6f7d218d95ed8 SHA512 ffb0b46b30b1add0fc166e3afe1317e70041a0fe849d4c05ceee011c1b5e130fbde3b86eaf876a4c8a2d23fbd7824f95299642b4f60e129436befb00f4b124cc
diff --git a/dev-lang/php/php-7.2.32.ebuild b/dev-lang/php/php-7.2.32.ebuild
new file mode 100644
index 000000000000..1b2056f984d8
--- /dev/null
+++ b/dev-lang/php/php-7.2.32.ebuild
@@ -0,0 +1,759 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+ BSD
+ Zend-2.0
+ bcmath? ( LGPL-2.1+ )
+ fpm? ( BSD-2 )
+ gd? ( gd )
+ unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+ coverage +ctype curl debug
+ enchant exif +fileinfo +filter firebird
+ +flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+ intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+ mhash mssql mysql mysqli nls
+ oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+ readline recode selinux +session session-mm sharedmem
+ +simplexml snmp soap sockets sodium spell sqlite ssl
+ sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+ >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+ >=dev-libs/libpcre-8.32[unicode]
+ fpm? ( acl? ( sys-apps/acl ) )
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+ argon2? ( app-crypt/argon2:= )
+ berkdb? ( || ( sys-libs/db:5.3
+ sys-libs/db:5.1
+ sys-libs/db:4.8
+ sys-libs/db:4.7
+ sys-libs/db:4.6
+ sys-libs/db:4.5 ) )
+ bzip2? ( app-arch/bzip2:0= )
+ cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+ coverage? ( dev-util/lcov )
+ curl? ( >=net-misc/curl-7.10.5 )
+ enchant? ( =virtual/jpeg-0-r3:0 media-libs/libpng:0= sys-libs/zlib )
+ gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+ gmp? ( dev-libs/gmp:0= )
+ iconv? ( virtual/libiconv )
+ imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+ intl? ( dev-libs/icu:= )
+ iodbc? ( dev-db/libiodbc )
+ kerberos? ( virtual/krb5 )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+ libedit? ( dev-libs/libedit )
+ lmdb? ( dev-db/lmdb:= )
+ mssql? ( dev-db/freetds[mssql] )
+ nls? ( sys-devel/gettext )
+ oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+ odbc? ( >=dev-db/unixODBC-1.8.13 )
+ postgres? ( dev-db/postgresql:* )
+ qdbm? ( dev-db/qdbm )
+ readline? ( sys-libs/readline:0= )
+ recode? ( app-text/recode )
+ session-mm? ( dev-libs/mm )
+ simplexml? ( >=dev-libs/libxml2-2.6.8 )
+ snmp? ( >=net-analyzer/net-snmp-5.2 )
+ soap? ( >=dev-libs/libxml2-2.6.8 )
+ sodium? ( dev-libs/libsodium:= )
+ spell? ( >=app-text/aspell-0.50 )
+ sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ truetype? ( =media-libs/freetype-2* )
+ unicode? ( dev-libs/oniguruma:= )
+ wddx? ( >=dev-libs/libxml2-2.6.8 )
+ webp? ( media-libs/libwebp:0= )
+ xml? ( >=dev-libs/libxml2-2.6.8 )
+ xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+ xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+ xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+ xpm? ( x11-libs/libXpm )
+ xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+ zip? ( sys-libs/zlib:0= )
+ zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+ zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/mta
+ fpm? (
+ selinux? ( sec-policy/selinux-phpfpm )
+ systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ >=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed phpdbg )
+ cli? ( ^^ ( readline libedit ) )
+ truetype? ( gd zlib )
+ webp? ( gd zlib )
+ cjk? ( gd zlib )
+ exif? ( gd zlib )
+ xpm? ( gd zlib )
+ gd? ( zlib )
+ simplexml? ( xml )
+ soap? ( xml )
+ wddx? ( xml )
+ xmlrpc? ( || ( xml iconv ) )
+ xmlreader? ( xml )
+ xslt? ( xml )
+ ldap-sasl? ( ldap )
+ mhash? ( hash )
+ phar? ( hash )
+ qdbm? ( !gdbm )
+ readline? ( !libedit )
+ recode? ( !imap !mysqli !mysql )
+ session-mm? ( session !threads )
+ mysql? ( hash || ( mysqli pdo ) )
+ mysqli? ( hash )
+ zip-encryption? ( zip )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/php-freetype-2.9.1.patch"
+ "${FILESDIR}/php-7.2.13-intl-use-icu-namespace.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+ local phpsapi="${1}"
+
+ # work out where we are installing the ini file
+ php_set_ini_dir "${phpsapi}"
+
+ # Always install the production INI file, bug 611214.
+ local phpinisrc="php.ini-production-${phpsapi}"
+ cp php.ini-production "${phpinisrc}" || die
+
+ # default to /tmp for save_path, bug #282768
+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+ # Set the extension dir
+ sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+ -i "${phpinisrc}" || die
+
+ # Set the include path to point to where we want to find PEAR packages
+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${phpinisrc}" php.ini
+
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+ elog
+
+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+ if use opcache; then
+ elog "Adding opcache to $PHP_EXT_INI_DIR"
+ echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+ "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+ dosym "../ext/opcache.ini" \
+ "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+ fi
+
+ # SAPI-specific handling
+ if [[ "${sapi}" == "fpm" ]] ; then
+ einfo "Installing FPM config files php-fpm.conf and www.conf"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ doins sapi/fpm/php-fpm.conf
+ insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+ doins sapi/fpm/www.conf
+ fi
+
+ dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+ PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+ PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+ PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+ default
+
+ # In php-7.x, the FPM pool configuration files have been split off
+ # of the main config. By default the pool config files go in
+ # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+ # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+ # we'll install the pool configuration file "www.conf" there.
+ php_set_ini_dir fpm
+ sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+ sapi/fpm/php-fpm.conf.in \
+ || die 'failed to move the include directory in php-fpm.conf'
+
+ # Bug 669566 - necessary so that build tools are updated for commands like pecl
+ # Force rebuilding aclocal.m4
+ rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+ eautoreconf
+}
+
+src_configure() {
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+ # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+ # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+ local our_conf=(
+ --prefix="${PHP_DESTDIR}"
+ --mandir="${PHP_DESTDIR}/man"
+ --infodir="${PHP_DESTDIR}/info"
+ --libdir="${PHP_DESTDIR}/lib"
+ --with-libdir="$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-pear
+ $(use_enable threads maintainer-zts)
+ )
+
+ our_conf+=(
+ $(use_with argon2 password-argon2 "${EPREFIX}/usr")
+ $(use_enable bcmath bcmath)
+ $(use_with bzip2 bz2 "${EPREFIX}/usr")
+ $(use_enable calendar calendar)
+ $(use_enable coverage gcov)
+ $(use_enable ctype ctype)
+ $(use_with curl curl "${EPREFIX}/usr")
+ $(use_enable xml dom)
+ $(use_with enchant enchant "${EPREFIX}/usr")
+ $(use_enable exif exif)
+ $(use_enable fileinfo fileinfo)
+ $(use_enable filter filter)
+ $(use_enable ftp ftp)
+ $(use_with nls gettext "${EPREFIX}/usr")
+ $(use_with gmp gmp "${EPREFIX}/usr")
+ $(use_enable hash hash)
+ $(use_with mhash mhash "${EPREFIX}/usr")
+ $(use_with iconv iconv \
+ $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+ $(use_enable intl intl)
+ $(use_enable ipv6 ipv6)
+ $(use_enable json json)
+ $(use_with kerberos kerberos "${EPREFIX}/usr")
+ $(use_enable xml libxml)
+ $(use_with xml libxml-dir "${EPREFIX}/usr")
+ $(use_enable unicode mbstring)
+ $(use_with unicode onig "${EPREFIX}/usr")
+ $(use_with ssl openssl "${EPREFIX}/usr")
+ $(use_with ssl openssl-dir "${EPREFIX}/usr")
+ $(use_enable pcntl pcntl)
+ $(use_enable phar phar)
+ $(use_enable pdo pdo)
+ $(use_enable opcache opcache)
+ $(use_with postgres pgsql "${EPREFIX}/usr")
+ $(use_enable posix posix)
+ $(use_with spell pspell "${EPREFIX}/usr")
+ $(use_with recode recode "${EPREFIX}/usr")
+ $(use_enable simplexml simplexml)
+ $(use_enable sharedmem shmop)
+ $(use_with snmp snmp "${EPREFIX}/usr")
+ $(use_enable soap soap)
+ $(use_enable sockets sockets)
+ $(use_with sodium sodium "${EPREFIX}/usr")
+ $(use_with sqlite sqlite3 "${EPREFIX}/usr")
+ $(use_enable sysvipc sysvmsg)
+ $(use_enable sysvipc sysvsem)
+ $(use_enable sysvipc sysvshm)
+ $(use_with tidy tidy "${EPREFIX}/usr")
+ $(use_enable tokenizer tokenizer)
+ $(use_enable wddx wddx)
+ $(use_enable xml xml)
+ $(use_enable xmlreader xmlreader)
+ $(use_enable xmlwriter xmlwriter)
+ $(use_with xmlrpc xmlrpc)
+ $(use_with xslt xsl "${EPREFIX}/usr")
+ $(use_enable zip zip)
+ $(use_with zip-encryption libzip "${EPREFIX}/usr")
+ $(use_with zlib zlib "${EPREFIX}/usr")
+ $(use_enable debug debug)
+ )
+
+ # DBA support
+ if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+ || use qdbm || use lmdb || use tokyocabinet ; then
+ our_conf+=( "--enable-dba${shared}" )
+ fi
+
+ # DBA drivers support
+ our_conf+=(
+ $(use_with cdb cdb)
+ $(use_with berkdb db4 "${EPREFIX}/usr")
+ $(use_enable flatfile flatfile)
+ $(use_with gdbm gdbm "${EPREFIX}/usr")
+ $(use_enable inifile inifile)
+ $(use_with qdbm qdbm "${EPREFIX}/usr")
+ $(use_with lmdb lmdb "${EPREFIX}/usr")
+ )
+
+ # Support for the GD graphics library
+ our_conf+=(
+ $(use_with truetype freetype-dir "${EPREFIX}/usr")
+ $(use_enable cjk gd-jis-conv)
+ $(use_with gd jpeg-dir "${EPREFIX}/usr")
+ $(use_with gd png-dir "${EPREFIX}/usr")
+ $(use_with xpm xpm-dir "${EPREFIX}/usr")
+ )
+ if use webp; then
+ our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+ fi
+ # enable gd last, so configure can pick up the previous settings
+ our_conf+=( $(use_with gd gd) )
+
+ # IMAP support
+ if use imap ; then
+ our_conf+=(
+ $(use_with imap imap "${EPREFIX}/usr")
+ $(use_with ssl imap-ssl "${EPREFIX}/usr")
+ )
+ fi
+
+ # Interbase/firebird support
+ our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+ # LDAP support
+ if use ldap ; then
+ our_conf+=(
+ $(use_with ldap ldap "${EPREFIX}/usr")
+ $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+ )
+ fi
+
+ # MySQL support
+ local mysqllib="mysqlnd"
+ local mysqlilib="mysqlnd"
+
+ our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+ local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ if use mysql || use mysqli ; then
+ our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+ fi
+
+ # ODBC support
+ our_conf+=(
+ $(use_with odbc unixODBC "${EPREFIX}/usr")
+ $(use_with iodbc iodbc "${EPREFIX}/usr")
+ )
+
+ # Oracle support
+ our_conf+=( $(use_with oci8-instant-client oci8) )
+
+ # PDO support
+ if use pdo ; then
+ our_conf+=(
+ $(use_with mssql pdo-dblib "${EPREFIX}/usr")
+ $(use_with mysql pdo-mysql "${mysqllib}")
+ $(use_with postgres pdo-pgsql)
+ $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+ $(use_with firebird pdo-firebird "${EPREFIX}/usr")
+ $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+ $(use_with oci8-instant-client pdo-oci)
+ )
+ fi
+
+ # readline/libedit support
+ our_conf+=(
+ $(use_with readline readline "${EPREFIX}/usr")
+ $(use_with libedit libedit "${EPREFIX}/usr")
+ )
+
+ # Session support
+ if use session ; then
+ our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+ else
+ our_conf+=( $(use_enable session session) )
+ fi
+
+ # Use pic for shared modules such as apache2's mod_php
+ our_conf+=( --with-pic )
+
+ # we use the system copy of pcre
+ # --with-pcre-regex affects ext/pcre
+ # --with-pcre-dir affects ext/filter and ext/zip
+ # --with-pcre-valgrind cannot be enabled with system pcre
+ # Many arches don't support pcre-jit
+ our_conf+=(
+ --with-pcre-regex="${EPREFIX}/usr"
+ --with-pcre-dir="${EPREFIX}/usr"
+ --without-pcre-valgrind
+ --without-pcre-jit
+ )
+
+ # Catch CFLAGS problems
+ # Fixes bug #14067.
+ # Changed order to run it in reverse for bug #32022 and #12021.
+ replace-cpu-flags "k6*" "i586"
+
+ # Cache the ./configure test results between SAPIs.
+ our_conf+=( --cache-file="${T}/config.cache" )
+
+ # Support user-passed configuration parameters
+ our_conf+=( ${EXTRA_ECONF:-} )
+
+ # Support the Apache2 extras, they must be set globally for all
+ # SAPIs to work correctly, especially for external PHP extensions
+
+ local one_sapi
+ local sapi
+ mkdir -p "${WORKDIR}/sapis-build" || die
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ # The BUILD_DIR variable is used to determine where to output
+ # the files that autotools creates. This was all originally
+ # based on the autotools-utils eclass.
+ BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+ cp -a "${S}" "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ local sapi_conf=(
+ --with-config-file-path="${PHP_INI_DIR}"
+ --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+ )
+
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm|phpdbg)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( "--enable-${sapi}" )
+ if [[ "fpm" == "${sapi}" ]] ; then
+ sapi_conf+=(
+ $(use_with acl fpm-acl)
+ $(use_with systemd fpm-systemd)
+ )
+ fi
+ else
+ sapi_conf+=( "--disable-${sapi}" )
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+ else
+ sapi_conf+=( --without-apxs2 )
+ fi
+ ;;
+ esac
+ done
+
+ # Construct the $myeconfargs array by concatenating $our_conf
+ # (the common args) and $sapi_conf (the SAPI-specific args).
+ local myeconfargs=( "${our_conf[@]}" )
+ myeconfargs+=( "${sapi_conf[@]}" )
+
+ pushd "${BUILD_DIR}" > /dev/null || die
+ econf "${myeconfargs[@]}"
+ popd > /dev/null || die
+ done
+}
+
+src_compile() {
+ # snmp seems to run during src_compile, too (bug #324739)
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ local sapi
+ for sapi in ${SAPIS} ; do
+ if use "${sapi}"; then
+ cd "${WORKDIR}/sapis-build/$sapi" || \
+ die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+ emake
+ fi
+ done
+}
+
+src_install() {
+ # see bug #324739 for what happens when we don't have that
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi="",sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
+ # Makefile forgets to create this before trying to write to it...
+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+ # Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi" || die
+ emake INSTALL_ROOT="${D}" \
+ install-build install-headers install-programs
+
+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+ # Create the directory where we'll put version-specific php scripts
+ keepdir "/usr/share/php${PHP_MV}"
+
+ local file=""
+ local sapi_list=""
+
+ for sapi in ${SAPIS}; do
+ if use "${sapi}" ; then
+ einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+ if [[ "${sapi}" == "apache2" ]] ; then
+ # We're specifically not using emake install-sapi as libtool
+ # may cause unnecessary relink failures (see bug #351266)
+ insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+ newins ".libs/libphp${PHP_MV}$(get_libname)" \
+ "libphp${PHP_MV}$(get_libname)"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
+ else
+ # needed each time, php_install_ini would reset it
+ local dest="${PHP_DESTDIR#${EPREFIX}}"
+ into "${dest}"
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ # Install the "phar" archive utility.
+ if use phar ; then
+ emake INSTALL_ROOT="${D}" install-pharcmd
+ dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+ fi
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp${PHP_MV}$(get_libname)"
+ ;;
+ phpdbg)
+ source="sapi/phpdbg/phpdbg"
+ ;;
+ *)
+ die "unhandled sapi in src_install"
+ ;;
+ esac
+
+ if [[ "${source}" == *"$(get_libname)" ]]; then
+ dolib.so "${source}"
+ else
+ dobin "${source}"
+ local name="$(basename ${source})"
+ dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+ fi
+ fi
+
+ php_install_ini "${sapi}"
+
+ # construct correct SAPI string for php-config
+ # thanks to ferringb for the bash voodoo
+ if [[ "${sapi}" == "apache2" ]]; then
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+ else
+ sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+ fi
+ fi
+ done
+
+ # Installing opcache module
+ if use opcache ; then
+ into "${PHP_DESTDIR#${EPREFIX}}"
+ dolib.so "modules/opcache$(get_libname)"
+ fi
+
+ # Install env.d files
+ newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+ sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+ sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+ # set php-config variable correctly (bug #278439)
+ sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+ if use fpm ; then
+ if use systemd; then
+ systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+ "php-fpm@${SLOT}.service"
+ else
+ systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+ "php-fpm@${SLOT}.service"
+ fi
+ fi
+}
+
+src_test() {
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+ if [[ ! -x "${PHP_BIN}" ]] ; then
+ ewarn "Test phase requires USE=cli, skipping"
+ return
+ else
+ export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+ export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+ fi
+
+ REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
+ "session.save_path=${T}" \
+ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+ "session.save_path=${T}"
+
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+ done
+
+ local failed="$(find -name '*.out')"
+ if [[ ${failed} != "" ]] ; then
+ ewarn "The following test cases failed unexpectedly:"
+ for name in ${failed}; do
+ ewarn " ${name/.out/}"
+ done
+ else
+ einfo "No unexpected test failures, all fine"
+ fi
+
+ if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+ local passed=""
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ [[ -f "${name}.diff" ]] && continue
+ passed="${passed} ${name}"
+ done
+ if [[ ${passed} != "" ]] ; then
+ einfo "The following test cases passed unexpectedly:"
+ for name in ${passed}; do
+ ewarn " ${passed}"
+ done
+ else
+ einfo "None of the known-to-fail tests passed, all fine"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ # Output some general info to the user
+ if use apache2 ; then
+ elog
+ elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+ elog "your apache2 command. OpenRC users can append that string to"
+ elog "APACHE2_OPTS in /etc/conf.d/apache2."
+ elog
+ elog "The apache module configuration file 70_mod_php.conf is"
+ elog "provided (and maintained) by eselect-php."
+ elog
+ fi
+
+ # Create the symlinks for php
+ local m
+ for m in ${SAPIS}; do
+ [[ ${m} == 'embed' ]] && continue;
+ if use $m ; then
+ local ci=$(eselect php show $m)
+ if [[ -z $ci ]]; then
+ eselect php set $m php${SLOT} || die
+ einfo "Switched ${m} to use php:${SLOT}"
+ einfo
+ elif [[ $ci != "php${SLOT}" ]] ; then
+ elog "To switch $m to use php:${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
+ fi
+ fi
+ done
+
+ # Remove dead symlinks for SAPIs that were just disabled. For
+ # example, if the user has the cgi SAPI enabled, then he has an
+ # eselect-php symlink for it. If he later reinstalls PHP with
+ # USE="-cgi", that symlink will break. This call to eselect is
+ # supposed to remove that dead link per bug 572436.
+ eselect php cleanup || die
+
+ if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+ elog "To build extensions for this version of PHP, you will need to"
+ elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+ elog
+ fi
+
+ # Warn about the removal of PHP_INI_VERSION if the user has it set.
+ if [[ -n "${PHP_INI_VERSION}" ]]; then
+ ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+ ewarn 'remove it from your configuration at your convenience. See'
+ ewarn
+ ewarn ' https://bugs.gentoo.org/611214'
+ ewarn
+ ewarn 'for more information.'
+ fi
+
+ elog "For details on how version slotting works, please see"
+ elog "the wiki:"
+ elog
+ elog " https://wiki.gentoo.org/wiki/PHP"
+ elog
+}
+
+pkg_postrm() {
+ # This serves two purposes. First, if we have just removed the last
+ # installed version of PHP, then this will remove any dead symlinks
+ # belonging to eselect-php. Second, if a user upgrades slots from
+ # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+ # his existing symlinks to point to the new 7.0 installation. The
+ # latter is bug 432962.
+ #
+ # Note: the eselect-php package may not be installed at this point,
+ # so we can't die() if this command fails.
+ eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.3.20.ebuild b/dev-lang/php/php-7.3.20.ebuild
new file mode 100644
index 000000000000..705d68d153f3
--- /dev/null
+++ b/dev-lang/php/php-7.3.20.ebuild
@@ -0,0 +1,760 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+ BSD
+ Zend-2.0
+ bcmath? ( LGPL-2.1+ )
+ fpm? ( BSD-2 )
+ gd? ( gd )
+ unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+ coverage +ctype curl debug
+ enchant exif +fileinfo +filter firebird
+ +flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+ intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+ mhash mssql mysql mysqli nls
+ oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+ readline recode selinux +session session-mm sharedmem
+ +simplexml snmp soap sockets sodium spell sqlite ssl
+ sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+ >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+ >=dev-libs/libpcre2-10.30[unicode]
+ fpm? ( acl? ( sys-apps/acl ) )
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+ argon2? ( app-crypt/argon2:= )
+ berkdb? ( || ( sys-libs/db:5.3
+ sys-libs/db:5.1
+ sys-libs/db:4.8
+ sys-libs/db:4.7
+ sys-libs/db:4.6
+ sys-libs/db:4.5 ) )
+ bzip2? ( app-arch/bzip2:0= )
+ cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+ coverage? ( dev-util/lcov )
+ curl? ( >=net-misc/curl-7.10.5 )
+ enchant? ( =virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 )
+ gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+ gmp? ( dev-libs/gmp:0= )
+ iconv? ( virtual/libiconv )
+ imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+ intl? ( dev-libs/icu:= )
+ iodbc? ( dev-db/libiodbc )
+ kerberos? ( virtual/krb5 )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+ libedit? ( dev-libs/libedit )
+ lmdb? ( dev-db/lmdb:= )
+ mssql? ( dev-db/freetds[mssql] )
+ nls? ( sys-devel/gettext )
+ oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+ odbc? ( >=dev-db/unixODBC-1.8.13 )
+ postgres? ( dev-db/postgresql:* )
+ qdbm? ( dev-db/qdbm )
+ readline? ( sys-libs/readline:0= )
+ recode? ( app-text/recode )
+ session-mm? ( dev-libs/mm )
+ simplexml? ( >=dev-libs/libxml2-2.6.8 )
+ snmp? ( >=net-analyzer/net-snmp-5.2 )
+ soap? ( >=dev-libs/libxml2-2.6.8 )
+ sodium? ( dev-libs/libsodium:= )
+ spell? ( >=app-text/aspell-0.50 )
+ sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ truetype? ( =media-libs/freetype-2* )
+ unicode? ( dev-libs/oniguruma:= )
+ wddx? ( >=dev-libs/libxml2-2.6.8 )
+ webp? ( media-libs/libwebp:0= )
+ xml? ( >=dev-libs/libxml2-2.6.8 )
+ xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+ xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+ xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+ xpm? ( x11-libs/libXpm )
+ xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+ zip? ( >=sys-libs/zlib-1.2.0.4:0= )
+ zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+ zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/mta
+ fpm? (
+ selinux? ( sec-policy/selinux-phpfpm )
+ systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ >=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed phpdbg )
+ cli? ( ^^ ( readline libedit ) )
+ truetype? ( gd zlib )
+ webp? ( gd zlib )
+ cjk? ( gd zlib )
+ exif? ( gd zlib )
+ xpm? ( gd zlib )
+ gd? ( zlib )
+ simplexml? ( xml )
+ soap? ( xml )
+ wddx? ( xml )
+ xmlrpc? ( || ( xml iconv ) )
+ xmlreader? ( xml )
+ xslt? ( xml )
+ ldap-sasl? ( ldap )
+ mhash? ( hash )
+ phar? ( hash )
+ qdbm? ( !gdbm )
+ readline? ( !libedit )
+ recode? ( !imap !mysqli !mysql )
+ session-mm? ( session !threads )
+ mysql? ( || ( mysqli pdo ) )
+ zip-encryption? ( zip )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/php-freetype-2.9.1.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+ local phpsapi="${1}"
+
+ # work out where we are installing the ini file
+ php_set_ini_dir "${phpsapi}"
+
+ # Always install the production INI file, bug 611214.
+ local phpinisrc="php.ini-production-${phpsapi}"
+ cp php.ini-production "${phpinisrc}" || die
+
+ # default to /tmp for save_path, bug #282768
+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+ # Set the extension dir
+ sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+ -i "${phpinisrc}" || die
+
+ # Set the include path to point to where we want to find PEAR packages
+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${phpinisrc}" php.ini
+
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+ elog
+
+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+ if use opcache; then
+ elog "Adding opcache to $PHP_EXT_INI_DIR"
+ echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+ "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+ dosym "../ext/opcache.ini" \
+ "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+ fi
+
+ # SAPI-specific handling
+ if [[ "${sapi}" == "fpm" ]] ; then
+ einfo "Installing FPM config files php-fpm.conf and www.conf"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ doins sapi/fpm/php-fpm.conf
+ insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+ doins sapi/fpm/www.conf
+ fi
+
+ dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+ PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+ PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+ PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+ default
+
+ # In php-7.x, the FPM pool configuration files have been split off
+ # of the main config. By default the pool config files go in
+ # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+ # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+ # we'll install the pool configuration file "www.conf" there.
+ php_set_ini_dir fpm
+ sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+ sapi/fpm/php-fpm.conf.in \
+ || die 'failed to move the include directory in php-fpm.conf'
+
+ # Bug 669566 - necessary so that build tools are updated for commands like pecl
+ # Force rebuilding aclocal.m4
+ rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+ eautoreconf
+}
+
+src_configure() {
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+ # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+ # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+ local our_conf=(
+ --prefix="${PHP_DESTDIR}"
+ --mandir="${PHP_DESTDIR}/man"
+ --infodir="${PHP_DESTDIR}/info"
+ --libdir="${PHP_DESTDIR}/lib"
+ --with-libdir="$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-pear
+ $(use_enable threads maintainer-zts)
+ )
+
+ our_conf+=(
+ $(use_with argon2 password-argon2 "${EPREFIX}/usr")
+ $(use_enable bcmath bcmath)
+ $(use_with bzip2 bz2 "${EPREFIX}/usr")
+ $(use_enable calendar calendar)
+ $(use_enable coverage gcov)
+ $(use_enable ctype ctype)
+ $(use_with curl curl "${EPREFIX}/usr")
+ $(use_enable xml dom)
+ $(use_with enchant enchant "${EPREFIX}/usr")
+ $(use_enable exif exif)
+ $(use_enable fileinfo fileinfo)
+ $(use_enable filter filter)
+ $(use_enable ftp ftp)
+ $(use_with nls gettext "${EPREFIX}/usr")
+ $(use_with gmp gmp "${EPREFIX}/usr")
+ $(use_enable hash hash)
+ $(use_with mhash mhash "${EPREFIX}/usr")
+ $(use_with iconv iconv \
+ $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+ $(use_enable intl intl)
+ $(use_enable ipv6 ipv6)
+ $(use_enable json json)
+ $(use_with kerberos kerberos "${EPREFIX}/usr")
+ $(use_enable xml libxml)
+ $(use_with xml libxml-dir "${EPREFIX}/usr")
+ $(use_enable unicode mbstring)
+ $(use_with unicode onig "${EPREFIX}/usr")
+ $(use_with ssl openssl "${EPREFIX}/usr")
+ $(use_with ssl openssl-dir "${EPREFIX}/usr")
+ $(use_enable pcntl pcntl)
+ $(use_enable phar phar)
+ $(use_enable pdo pdo)
+ $(use_enable opcache opcache)
+ $(use_with postgres pgsql "${EPREFIX}/usr")
+ $(use_enable posix posix)
+ $(use_with spell pspell "${EPREFIX}/usr")
+ $(use_with recode recode "${EPREFIX}/usr")
+ $(use_enable simplexml simplexml)
+ $(use_enable sharedmem shmop)
+ $(use_with snmp snmp "${EPREFIX}/usr")
+ $(use_enable soap soap)
+ $(use_enable sockets sockets)
+ $(use_with sodium sodium "${EPREFIX}/usr")
+ $(use_with sqlite sqlite3 "${EPREFIX}/usr")
+ $(use_enable sysvipc sysvmsg)
+ $(use_enable sysvipc sysvsem)
+ $(use_enable sysvipc sysvshm)
+ $(use_with tidy tidy "${EPREFIX}/usr")
+ $(use_enable tokenizer tokenizer)
+ $(use_enable wddx wddx)
+ $(use_enable xml xml)
+ $(use_enable xmlreader xmlreader)
+ $(use_enable xmlwriter xmlwriter)
+ $(use_with xmlrpc xmlrpc)
+ $(use_with xslt xsl "${EPREFIX}/usr")
+ $(use_enable zip zip)
+ $(use_with zip-encryption libzip "${EPREFIX}/usr")
+ $(use_with zlib zlib "${EPREFIX}/usr")
+ $(use_enable debug debug)
+ )
+
+ # DBA support
+ if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+ || use qdbm || use lmdb || use tokyocabinet ; then
+ our_conf+=( "--enable-dba${shared}" )
+ fi
+
+ # DBA drivers support
+ our_conf+=(
+ $(use_with cdb cdb)
+ $(use_with berkdb db4 "${EPREFIX}/usr")
+ $(use_enable flatfile flatfile)
+ $(use_with gdbm gdbm "${EPREFIX}/usr")
+ $(use_enable inifile inifile)
+ $(use_with qdbm qdbm "${EPREFIX}/usr")
+ $(use_with lmdb lmdb "${EPREFIX}/usr")
+ )
+
+ # Support for the GD graphics library
+ our_conf+=(
+ $(use_with truetype freetype-dir "${EPREFIX}/usr")
+ $(use_enable cjk gd-jis-conv)
+ $(use_with gd jpeg-dir "${EPREFIX}/usr")
+ $(use_with gd png-dir "${EPREFIX}/usr")
+ $(use_with xpm xpm-dir "${EPREFIX}/usr")
+ )
+ if use webp; then
+ our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+ fi
+ # enable gd last, so configure can pick up the previous settings
+ our_conf+=( $(use_with gd gd) )
+
+ # IMAP support
+ if use imap ; then
+ our_conf+=(
+ $(use_with imap imap "${EPREFIX}/usr")
+ $(use_with ssl imap-ssl "${EPREFIX}/usr")
+ )
+ fi
+
+ # Interbase/firebird support
+ our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+ # LDAP support
+ if use ldap ; then
+ our_conf+=(
+ $(use_with ldap ldap "${EPREFIX}/usr")
+ $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+ )
+ fi
+
+ # MySQL support
+ local mysqllib="mysqlnd"
+ local mysqlilib="mysqlnd"
+
+ our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+ local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ if use mysql || use mysqli ; then
+ our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+ fi
+
+ # ODBC support
+ our_conf+=(
+ $(use_with odbc unixODBC "${EPREFIX}/usr")
+ $(use_with iodbc iodbc "${EPREFIX}/usr")
+ )
+
+ # Oracle support
+ our_conf+=( $(use_with oci8-instant-client oci8) )
+
+ # PDO support
+ if use pdo ; then
+ our_conf+=(
+ $(use_with mssql pdo-dblib "${EPREFIX}/usr")
+ $(use_with mysql pdo-mysql "${mysqllib}")
+ $(use_with postgres pdo-pgsql)
+ $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+ $(use_with firebird pdo-firebird "${EPREFIX}/usr")
+ $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+ $(use_with oci8-instant-client pdo-oci)
+ )
+ fi
+
+ # readline/libedit support
+ our_conf+=(
+ $(use_with readline readline "${EPREFIX}/usr")
+ $(use_with libedit libedit "${EPREFIX}/usr")
+ )
+
+ # Session support
+ if use session ; then
+ our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+ else
+ our_conf+=( $(use_enable session session) )
+ fi
+
+ # Use pic for shared modules such as apache2's mod_php
+ our_conf+=( --with-pic )
+
+ # we use the system copy of pcre
+ # --with-pcre-regex affects ext/pcre
+ # --with-pcre-dir affects ext/filter and ext/zip
+ # --with-pcre-valgrind cannot be enabled with system pcre
+ # Many arches don't support pcre-jit
+ our_conf+=(
+ --with-pcre-regex="${EPREFIX}/usr"
+ --with-pcre-dir="${EPREFIX}/usr"
+ --without-pcre-valgrind
+ --without-pcre-jit
+ )
+
+ # Catch CFLAGS problems
+ # Fixes bug #14067.
+ # Changed order to run it in reverse for bug #32022 and #12021.
+ replace-cpu-flags "k6*" "i586"
+
+ # Cache the ./configure test results between SAPIs.
+ our_conf+=( --cache-file="${T}/config.cache" )
+
+ # Support user-passed configuration parameters
+ our_conf+=( ${EXTRA_ECONF:-} )
+
+ # Support the Apache2 extras, they must be set globally for all
+ # SAPIs to work correctly, especially for external PHP extensions
+
+ local one_sapi
+ local sapi
+ mkdir -p "${WORKDIR}/sapis-build" || die
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ # The BUILD_DIR variable is used to determine where to output
+ # the files that autotools creates. This was all originally
+ # based on the autotools-utils eclass.
+ BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+ cp -a "${S}" "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ local sapi_conf=(
+ --with-config-file-path="${PHP_INI_DIR}"
+ --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+ )
+
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm|phpdbg)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( "--enable-${sapi}" )
+ if [[ "fpm" == "${sapi}" ]] ; then
+ sapi_conf+=(
+ $(use_with acl fpm-acl)
+ $(use_with systemd fpm-systemd)
+ )
+ fi
+ else
+ sapi_conf+=( "--disable-${sapi}" )
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+ else
+ sapi_conf+=( --without-apxs2 )
+ fi
+ ;;
+ esac
+ done
+
+ # Construct the $myeconfargs array by concatenating $our_conf
+ # (the common args) and $sapi_conf (the SAPI-specific args).
+ local myeconfargs=( "${our_conf[@]}" )
+ myeconfargs+=( "${sapi_conf[@]}" )
+
+ pushd "${BUILD_DIR}" > /dev/null || die
+ econf "${myeconfargs[@]}"
+ popd > /dev/null || die
+ done
+}
+
+src_compile() {
+ # snmp seems to run during src_compile, too (bug #324739)
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ local sapi
+ for sapi in ${SAPIS} ; do
+ if use "${sapi}"; then
+ cd "${WORKDIR}/sapis-build/$sapi" || \
+ die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+ emake
+ fi
+ done
+}
+
+src_install() {
+ # see bug #324739 for what happens when we don't have that
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi="", sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
+ # Makefile forgets to create this before trying to write to it...
+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+ # Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi" || die
+ emake INSTALL_ROOT="${D}" \
+ install-build install-headers install-programs
+
+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+ # Create the directory where we'll put version-specific php scripts
+ keepdir "/usr/share/php${PHP_MV}"
+
+ local file=""
+ local sapi_list=""
+
+ for sapi in ${SAPIS}; do
+ if use "${sapi}" ; then
+ einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+ if [[ "${sapi}" == "apache2" ]] ; then
+ # We're specifically not using emake install-sapi as libtool
+ # may cause unnecessary relink failures (see bug #351266)
+ insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+ newins ".libs/libphp${PHP_MV}$(get_libname)" \
+ "libphp${PHP_MV}$(get_libname)"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
+ else
+ # needed each time, php_install_ini would reset it
+ local dest="${PHP_DESTDIR#${EPREFIX}}"
+ into "${dest}"
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ # Install the "phar" archive utility.
+ if use phar ; then
+ emake INSTALL_ROOT="${D}" install-pharcmd
+ dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+ fi
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp${PHP_MV}$(get_libname)"
+ ;;
+ phpdbg)
+ source="sapi/phpdbg/phpdbg"
+ ;;
+ *)
+ die "unhandled sapi in src_install"
+ ;;
+ esac
+
+ if [[ "${source}" == *"$(get_libname)" ]]; then
+ dolib.so "${source}"
+ else
+ dobin "${source}"
+ local name="$(basename ${source})"
+ dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+ fi
+ fi
+
+ php_install_ini "${sapi}"
+
+ # construct correct SAPI string for php-config
+ # thanks to ferringb for the bash voodoo
+ if [[ "${sapi}" == "apache2" ]]; then
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+ else
+ sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+ fi
+ fi
+ done
+
+ # Installing opcache module
+ if use opcache ; then
+ into "${PHP_DESTDIR#${EPREFIX}}"
+ dolib.so "modules/opcache$(get_libname)"
+ fi
+
+ # Install env.d files
+ newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+ sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+ sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+ # set php-config variable correctly (bug #278439)
+ sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+ if use fpm ; then
+ if use systemd; then
+ systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+ "php-fpm@${SLOT}.service"
+ else
+ systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+ "php-fpm@${SLOT}.service"
+ fi
+ fi
+}
+
+src_test() {
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+ if [[ ! -x "${PHP_BIN}" ]] ; then
+ ewarn "Test phase requires USE=cli, skipping"
+ return
+ else
+ export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+ export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+ fi
+
+ REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
+ "session.save_path=${T}" \
+ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+ "session.save_path=${T}"
+
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+ done
+
+ local failed="$(find -name '*.out')"
+ if [[ ${failed} != "" ]] ; then
+ ewarn "The following test cases failed unexpectedly:"
+ for name in ${failed}; do
+ ewarn " ${name/.out/}"
+ done
+ else
+ einfo "No unexpected test failures, all fine"
+ fi
+
+ if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+ local passed=""
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ [[ -f "${name}.diff" ]] && continue
+ passed="${passed} ${name}"
+ done
+ if [[ ${passed} != "" ]] ; then
+ einfo "The following test cases passed unexpectedly:"
+ for name in ${passed}; do
+ ewarn " ${passed}"
+ done
+ else
+ einfo "None of the known-to-fail tests passed, all fine"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ # Output some general info to the user
+ if use apache2 ; then
+ elog
+ elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+ elog "your apache2 command. OpenRC users can append that string to"
+ elog "APACHE2_OPTS in /etc/conf.d/apache2."
+ elog
+ elog "The apache module configuration file 70_mod_php.conf is"
+ elog "provided (and maintained) by eselect-php."
+ elog
+ fi
+
+ # Create the symlinks for php
+ local m
+ for m in ${SAPIS}; do
+ [[ ${m} == 'embed' ]] && continue;
+ if use $m ; then
+ local ci=$(eselect php show $m)
+ if [[ -z $ci ]]; then
+ eselect php set $m php${SLOT} || die
+ einfo "Switched ${m} to use php:${SLOT}"
+ einfo
+ elif [[ $ci != "php${SLOT}" ]] ; then
+ elog "To switch $m to use php:${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
+ fi
+ fi
+ done
+
+ # Remove dead symlinks for SAPIs that were just disabled. For
+ # example, if the user has the cgi SAPI enabled, then he has an
+ # eselect-php symlink for it. If he later reinstalls PHP with
+ # USE="-cgi", that symlink will break. This call to eselect is
+ # supposed to remove that dead link per bug 572436.
+ eselect php cleanup || die
+
+ if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+ elog "To build extensions for this version of PHP, you will need to"
+ elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+ elog
+ fi
+
+ # Warn about the removal of PHP_INI_VERSION if the user has it set.
+ if [[ -n "${PHP_INI_VERSION}" ]]; then
+ ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+ ewarn 'remove it from your configuration at your convenience. See'
+ ewarn
+ ewarn ' https://bugs.gentoo.org/611214'
+ ewarn
+ ewarn 'for more information.'
+ fi
+
+ elog "For details on how version slotting works, please see"
+ elog "the wiki:"
+ elog
+ elog " https://wiki.gentoo.org/wiki/PHP"
+ elog
+}
+
+pkg_postrm() {
+ # This serves two purposes. First, if we have just removed the last
+ # installed version of PHP, then this will remove any dead symlinks
+ # belonging to eselect-php. Second, if a user upgrades slots from
+ # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+ # his existing symlinks to point to the new 7.0 installation. The
+ # latter is bug 432962.
+ #
+ # Note: the eselect-php package may not be installed at this point,
+ # so we can't die() if this command fails.
+ eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.4.8.ebuild b/dev-lang/php/php-7.4.8.ebuild
new file mode 100644
index 000000000000..3ac0d8c9ace3
--- /dev/null
+++ b/dev-lang/php/php-7.4.8.ebuild
@@ -0,0 +1,750 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+ BSD
+ Zend-2.0
+ bcmath? ( LGPL-2.1+ )
+ fpm? ( BSD-2 )
+ gd? ( gd )
+ unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+ coverage +ctype curl debug
+ enchant exif ffi +fileinfo +filter firebird
+ +flatfile ftp gd gdbm gmp +iconv imap inifile
+ intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+ mhash mssql mysql mysqli nls
+ oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+ readline selinux +session session-mm sharedmem
+ +simplexml snmp soap sockets sodium spell sqlite ssl
+ sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed phpdbg )
+ cli? ( ^^ ( readline libedit ) )
+ !cli? ( ?? ( readline libedit ) )
+ truetype? ( gd zlib )
+ webp? ( gd zlib )
+ cjk? ( gd zlib )
+ exif? ( gd zlib )
+ xpm? ( gd zlib )
+ gd? ( zlib )
+ simplexml? ( xml )
+ soap? ( xml )
+ xmlrpc? ( xml iconv )
+ xmlreader? ( xml )
+ xmlwriter? ( xml )
+ xslt? ( xml )
+ ldap-sasl? ( ldap )
+ qdbm? ( !gdbm )
+ session-mm? ( session !threads )
+ mysql? ( || ( mysqli pdo ) )
+ firebird? ( pdo )
+ mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+ >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+ >=dev-libs/libpcre2-10.30[unicode]
+ fpm? ( acl? ( sys-apps/acl ) )
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+ argon2? ( app-crypt/argon2:= )
+ berkdb? ( || ( sys-libs/db:5.3
+ sys-libs/db:5.1
+ sys-libs/db:4.8
+ sys-libs/db:4.7
+ sys-libs/db:4.6
+ sys-libs/db:4.5 ) )
+ bzip2? ( app-arch/bzip2:0= )
+ cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+ coverage? ( dev-util/lcov )
+ curl? ( >=net-misc/curl-7.10.5 )
+ enchant? ( =dev-libs/libffi-3.0.11 )
+ firebird? ( dev-db/firebird )
+ gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
+ gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+ gmp? ( dev-libs/gmp:0= )
+ iconv? ( virtual/libiconv )
+ imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+ intl? ( dev-libs/icu:= )
+ kerberos? ( virtual/krb5 )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap-sasl? ( dev-libs/cyrus-sasl )
+ libedit? ( dev-libs/libedit )
+ lmdb? ( dev-db/lmdb:= )
+ mssql? ( dev-db/freetds[mssql] )
+ nls? ( sys-devel/gettext )
+ oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+ odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+ postgres? ( dev-db/postgresql:* )
+ qdbm? ( dev-db/qdbm )
+ readline? ( sys-libs/readline:0= )
+ session-mm? ( dev-libs/mm )
+ snmp? ( >=net-analyzer/net-snmp-5.2 )
+ sodium? ( dev-libs/libsodium:= )
+ spell? ( >=app-text/aspell-0.50 )
+ sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ truetype? ( =media-libs/freetype-2* )
+ unicode? ( dev-libs/oniguruma:= )
+ webp? ( media-libs/libwebp:0= )
+ xml? ( >=dev-libs/libxml2-2.7.6 )
+ xpm? ( x11-libs/libXpm )
+ xslt? ( dev-libs/libxslt )
+ zip? ( >=dev-libs/libzip-1.2.0:= )
+ zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/mta
+ fpm? (
+ selinux? ( sec-policy/selinux-phpfpm )
+ systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ >=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" )
+
+php_install_ini() {
+ local phpsapi="${1}"
+
+ # work out where we are installing the ini file
+ php_set_ini_dir "${phpsapi}"
+
+ # Always install the production INI file, bug 611214.
+ local phpinisrc="php.ini-production-${phpsapi}"
+ cp php.ini-production "${phpinisrc}" || die
+
+ # default to /tmp for save_path, bug #282768
+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+ # Set the extension dir
+ sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+ -i "${phpinisrc}" || die
+
+ # Set the include path to point to where we want to find PEAR packages
+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${phpinisrc}" php.ini
+
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+ elog
+
+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+ if use opcache; then
+ elog "Adding opcache to $PHP_EXT_INI_DIR"
+ echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+ "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+ dosym "../ext/opcache.ini" \
+ "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+ fi
+
+ # SAPI-specific handling
+ if [[ "${sapi}" == "fpm" ]] ; then
+ einfo "Installing FPM config files php-fpm.conf and www.conf"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ doins sapi/fpm/php-fpm.conf
+ insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+ doins sapi/fpm/www.conf
+ fi
+
+ dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+ PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+ PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+ PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+ default
+
+ # In php-7.x, the FPM pool configuration files have been split off
+ # of the main config. By default the pool config files go in
+ # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+ # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+ # we'll install the pool configuration file "www.conf" there.
+ php_set_ini_dir fpm
+ sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+ sapi/fpm/php-fpm.conf.in \
+ || die 'failed to move the include directory in php-fpm.conf'
+
+ # Emulate buildconf to support cross-compilation
+ rm -fr aclocal.m4 autom4te.cache config.cache \
+ configure main/php_config.h.in || die
+ eautoconf --force
+ eautoheader
+}
+
+src_configure() {
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+ # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+ # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+ local our_conf=(
+ --prefix="${PHP_DESTDIR}"
+ --mandir="${PHP_DESTDIR}/man"
+ --infodir="${PHP_DESTDIR}/info"
+ --libdir="${PHP_DESTDIR}/lib"
+ --with-libdir="$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-pear
+ $(use_enable threads maintainer-zts)
+ )
+
+ our_conf+=(
+ $(use_with argon2 password-argon2 "${EPREFIX}/usr")
+ $(use_enable bcmath)
+ $(use_with bzip2 bz2 "${EPREFIX}/usr")
+ $(use_enable calendar)
+ $(use_enable coverage gcov)
+ $(use_enable ctype)
+ $(use_with curl)
+ $(use_enable xml dom)
+ $(use_with enchant)
+ $(use_enable exif)
+ $(use_with ffi)
+ $(use_enable fileinfo)
+ $(use_enable filter)
+ $(use_enable ftp)
+ $(use_with nls gettext "${EPREFIX}/usr")
+ $(use_with gmp gmp "${EPREFIX}/usr")
+ $(use_with mhash mhash "${EPREFIX}/usr")
+ $(use_with iconv iconv \
+ $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+ $(use_enable intl)
+ $(use_enable ipv6)
+ $(use_enable json)
+ $(use_with kerberos)
+ $(use_with xml libxml)
+ $(use_enable unicode mbstring)
+ $(use_with ssl openssl)
+ $(use_enable pcntl)
+ $(use_enable phar)
+ $(use_enable pdo)
+ $(use_enable opcache)
+ $(use_with postgres pgsql "${EPREFIX}/usr")
+ $(use_enable posix)
+ $(use_with spell pspell "${EPREFIX}/usr")
+ $(use_enable simplexml)
+ $(use_enable sharedmem shmop)
+ $(use_with snmp snmp "${EPREFIX}/usr")
+ $(use_enable soap)
+ $(use_enable sockets)
+ $(use_with sodium)
+ $(use_with sqlite sqlite3)
+ $(use_enable sysvipc sysvmsg)
+ $(use_enable sysvipc sysvsem)
+ $(use_enable sysvipc sysvshm)
+ $(use_with tidy tidy "${EPREFIX}/usr")
+ $(use_enable tokenizer)
+ $(use_enable xml)
+ $(use_enable xmlreader)
+ $(use_enable xmlwriter)
+ $(use_with xmlrpc)
+ $(use_with xslt xsl)
+ $(use_with zip)
+ $(use_with zlib zlib "${EPREFIX}/usr")
+ $(use_enable debug)
+ )
+
+ # DBA support
+ if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+ || use qdbm || use lmdb || use tokyocabinet ; then
+ our_conf+=( "--enable-dba" )
+ fi
+
+ # DBA drivers support
+ our_conf+=(
+ $(use_with cdb)
+ $(use_with berkdb db4 "${EPREFIX}/usr")
+ $(use_enable flatfile)
+ $(use_with gdbm gdbm "${EPREFIX}/usr")
+ $(use_enable inifile)
+ $(use_with qdbm qdbm "${EPREFIX}/usr")
+ $(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+ $(use_with lmdb lmdb "${EPREFIX}/usr")
+ )
+
+ # Support for the GD graphics library
+ our_conf+=(
+ $(use_with truetype freetype)
+ $(use_enable cjk gd-jis-conv)
+ $(use_with gd jpeg)
+ $(use_with xpm)
+ $(use_with webp)
+ )
+ # enable gd last, so configure can pick up the previous settings
+ our_conf+=( $(use_enable gd) )
+
+ # IMAP support
+ if use imap ; then
+ our_conf+=(
+ $(use_with imap imap "${EPREFIX}/usr")
+ $(use_with ssl imap-ssl "${EPREFIX}/usr")
+ )
+ fi
+
+ # LDAP support
+ if use ldap ; then
+ our_conf+=(
+ $(use_with ldap ldap "${EPREFIX}/usr")
+ $(use_with ldap-sasl)
+ )
+ fi
+
+ # MySQL support
+ local mysqllib="mysqlnd"
+ local mysqlilib="mysqlnd"
+
+ our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+ local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ if use mysql || use mysqli ; then
+ our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+ fi
+
+ # ODBC support
+ if use odbc && use iodbc ; then
+ our_conf+=(
+ --without-unixODBC
+ --with-iodbc
+ $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+ )
+ elif use odbc ; then
+ our_conf+=(
+ --with-unixODBC="${EPREFIX}/usr"
+ --without-iodbc
+ $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+ )
+ else
+ our_conf+=(
+ --without-unixODBC
+ --without-iodbc
+ --without-pdo-odbc
+ )
+ fi
+
+ # Oracle support
+ our_conf+=( $(use_with oci8-instant-client oci8) )
+
+ # PDO support
+ if use pdo ; then
+ our_conf+=(
+ $(use_with mssql pdo-dblib "${EPREFIX}/usr")
+ $(use_with mysql pdo-mysql "${mysqllib}")
+ $(use_with postgres pdo-pgsql)
+ $(use_with sqlite pdo-sqlite)
+ $(use_with firebird pdo-firebird "${EPREFIX}/usr")
+ $(use_with oci8-instant-client pdo-oci)
+ )
+ fi
+
+ # readline/libedit support
+ our_conf+=(
+ $(use_with readline readline "${EPREFIX}/usr")
+ $(use_with libedit)
+ )
+
+ # Session support
+ if use session ; then
+ our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+ else
+ our_conf+=( $(use_enable session) )
+ fi
+
+ # Use pic for shared modules such as apache2's mod_php
+ our_conf+=( --with-pic )
+
+ # we use the system copy of pcre
+ # --with-external-pcre affects ext/pcre
+ # Many arches don't support pcre-jit
+ our_conf+=(
+ --with-external-pcre
+ --without-pcre-jit
+ )
+
+ # Catch CFLAGS problems
+ # Fixes bug #14067.
+ # Changed order to run it in reverse for bug #32022 and #12021.
+ replace-cpu-flags "k6*" "i586"
+
+ # Cache the ./configure test results between SAPIs.
+ our_conf+=( --cache-file="${T}/config.cache" )
+
+ # Support user-passed configuration parameters
+ our_conf+=( ${EXTRA_ECONF:-} )
+
+ # Support the Apache2 extras, they must be set globally for all
+ # SAPIs to work correctly, especially for external PHP extensions
+
+ local one_sapi
+ local sapi
+ mkdir -p "${WORKDIR}/sapis-build" || die
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ # The BUILD_DIR variable is used to determine where to output
+ # the files that autotools creates. This was all originally
+ # based on the autotools-utils eclass.
+ BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+ cp -a "${S}" "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ local sapi_conf=(
+ --with-config-file-path="${PHP_INI_DIR}"
+ --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+ )
+
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm|phpdbg)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( "--enable-${sapi}" )
+ if [[ "fpm" == "${sapi}" ]] ; then
+ sapi_conf+=(
+ $(use_with acl fpm-acl)
+ $(use_with systemd fpm-systemd)
+ )
+ fi
+ else
+ sapi_conf+=( "--disable-${sapi}" )
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+ else
+ sapi_conf+=( --without-apxs2 )
+ fi
+ ;;
+ esac
+ done
+
+ # Construct the $myeconfargs array by concatenating $our_conf
+ # (the common args) and $sapi_conf (the SAPI-specific args).
+ local myeconfargs=( "${our_conf[@]}" )
+ myeconfargs+=( "${sapi_conf[@]}" )
+
+ pushd "${BUILD_DIR}" > /dev/null || die
+ econf "${myeconfargs[@]}"
+ popd > /dev/null || die
+ done
+}
+
+src_compile() {
+ # snmp seems to run during src_compile, too (bug #324739)
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ local sapi
+ for sapi in ${SAPIS} ; do
+ if use "${sapi}"; then
+ cd "${WORKDIR}/sapis-build/$sapi" || \
+ die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+ emake
+ fi
+ done
+}
+
+src_install() {
+ # see bug #324739 for what happens when we don't have that
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi="", sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
+ # Makefile forgets to create this before trying to write to it...
+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+ # Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi" || die
+ emake INSTALL_ROOT="${D}" \
+ install-build install-headers install-programs
+
+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+ # Create the directory where we'll put version-specific php scripts
+ keepdir "/usr/share/php${PHP_MV}"
+
+ local file=""
+ local sapi_list=""
+
+ for sapi in ${SAPIS}; do
+ if use "${sapi}" ; then
+ einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+ if [[ "${sapi}" == "apache2" ]] ; then
+ # We're specifically not using emake install-sapi as libtool
+ # may cause unnecessary relink failures (see bug #351266)
+ insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+ newins ".libs/libphp${PHP_MV}$(get_libname)" \
+ "libphp${PHP_MV}$(get_libname)"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
+ else
+ # needed each time, php_install_ini would reset it
+ local dest="${PHP_DESTDIR#${EPREFIX}}"
+ into "${dest}"
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ # Install the "phar" archive utility.
+ if use phar ; then
+ emake INSTALL_ROOT="${D}" install-pharcmd
+ dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+ fi
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp${PHP_MV}$(get_libname)"
+ ;;
+ phpdbg)
+ source="sapi/phpdbg/phpdbg"
+ ;;
+ *)
+ die "unhandled sapi in src_install"
+ ;;
+ esac
+
+ if [[ "${source}" == *"$(get_libname)" ]]; then
+ dolib.so "${source}"
+ else
+ dobin "${source}"
+ local name="$(basename ${source})"
+ dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+ fi
+ fi
+
+ php_install_ini "${sapi}"
+
+ # construct correct SAPI string for php-config
+ # thanks to ferringb for the bash voodoo
+ if [[ "${sapi}" == "apache2" ]]; then
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+ else
+ sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+ fi
+ fi
+ done
+
+ # Installing opcache module
+ if use opcache ; then
+ into "${PHP_DESTDIR#${EPREFIX}}"
+ dolib.so "modules/opcache$(get_libname)"
+ fi
+
+ # Install env.d files
+ newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+ sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+ sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+ # set php-config variable correctly (bug #278439)
+ sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+ if use fpm ; then
+ if use systemd; then
+ systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+ "php-fpm@${SLOT}.service"
+ else
+ systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+ "php-fpm@${SLOT}.service"
+ fi
+ fi
+}
+
+src_test() {
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+ if [[ ! -x "${PHP_BIN}" ]] ; then
+ ewarn "Test phase requires USE=cli, skipping"
+ return
+ else
+ export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+ export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+ fi
+
+ REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
+ "session.save_path=${T}" \
+ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+ "session.save_path=${T}"
+
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+ done
+
+ local failed="$(find -name '*.out')"
+ if [[ ${failed} != "" ]] ; then
+ ewarn "The following test cases failed unexpectedly:"
+ for name in ${failed}; do
+ ewarn " ${name/.out/}"
+ done
+ else
+ einfo "No unexpected test failures, all fine"
+ fi
+
+ if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+ local passed=""
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ [[ -f "${name}.diff" ]] && continue
+ passed="${passed} ${name}"
+ done
+ if [[ ${passed} != "" ]] ; then
+ einfo "The following test cases passed unexpectedly:"
+ for name in ${passed}; do
+ ewarn " ${passed}"
+ done
+ else
+ einfo "None of the known-to-fail tests passed, all fine"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ # Output some general info to the user
+ if use apache2 ; then
+ elog
+ elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+ elog "your apache2 command. OpenRC users can append that string to"
+ elog "APACHE2_OPTS in /etc/conf.d/apache2."
+ elog
+ elog "The apache module configuration file 70_mod_php.conf is"
+ elog "provided (and maintained) by eselect-php."
+ elog
+ fi
+
+ # Create the symlinks for php
+ local m
+ for m in ${SAPIS}; do
+ [[ ${m} == 'embed' ]] && continue;
+ if use $m ; then
+ local ci=$(eselect php show $m)
+ if [[ -z $ci ]]; then
+ eselect php set $m php${SLOT} || die
+ einfo "Switched ${m} to use php:${SLOT}"
+ einfo
+ elif [[ $ci != "php${SLOT}" ]] ; then
+ elog "To switch $m to use php:${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
+ fi
+ fi
+ done
+
+ # Remove dead symlinks for SAPIs that were just disabled. For
+ # example, if the user has the cgi SAPI enabled, then he has an
+ # eselect-php symlink for it. If he later reinstalls PHP with
+ # USE="-cgi", that symlink will break. This call to eselect is
+ # supposed to remove that dead link per bug 572436.
+ eselect php cleanup || die
+
+ if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+ elog "To build extensions for this version of PHP, you will need to"
+ elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+ elog
+ fi
+
+ # Warn about the removal of PHP_INI_VERSION if the user has it set.
+ if [[ -n "${PHP_INI_VERSION}" ]]; then
+ ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+ ewarn 'remove it from your configuration at your convenience. See'
+ ewarn
+ ewarn ' https://bugs.gentoo.org/611214'
+ ewarn
+ ewarn 'for more information.'
+ fi
+
+ elog "For details on how version slotting works, please see"
+ elog "the wiki:"
+ elog
+ elog " https://wiki.gentoo.org/wiki/PHP"
+ elog
+}
+
+pkg_postrm() {
+ # This serves two purposes. First, if we have just removed the last
+ # installed version of PHP, then this will remove any dead symlinks
+ # belonging to eselect-php. Second, if a user upgrades slots from
+ # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+ # his existing symlinks to point to the new 7.0 installation. The
+ # latter is bug 432962.
+ #
+ # Note: the eselect-php package may not be installed at this point,
+ # so we can't die() if this command fails.
+ eselect php cleanup
+}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 2e6a1f5190c2..631a25ae3a9c 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -19,11 +19,11 @@ DIST python-gentoo-patches-3.8.3-r1.tar.xz 12492 BLAKE2B c580918faba7b13137f108b
DIST python-gentoo-patches-3.9.0b3.tar.xz 8592 BLAKE2B 261dc9a5c7b370eb3f693f5bfb15562a5ee8b24b038db1b16571f096ff0d451ef8830c7f51db53366ebcf6e378dfab57e186f1789dc3ecc95e65595708f4428e SHA512 4c630b1b15e752ae154bfc9d0f5c8a17ac02127f96ccf114469bb92d02fe7d2ac13acd2415bfe6af0169c823b4aec09e2d6886c031df8e8c809ccb94efa60b62
EBUILD python-2.7.18.ebuild 10593 BLAKE2B 8e0f4c58a44ffe10533a7e534bb28a642e258468a4d546a77e39075d1c8ff63d2b3e9d99858eb1d93f84b40101f9cdc2b1db0e45ab6755167da486e5f9468e59 SHA512 5f880a3e0a47efb13d0f9f7f9e7ad01f78c46d772d9de999c3bb67b68adca05a1e01dc2fff8b21b8daaba9e0b9cdb44642c35e04a98217b04d5e2ee3fda2719e
EBUILD python-3.6.10-r2.ebuild 10333 BLAKE2B 550cfb681267f867d7454097faabf278517f6dbd93b64b879d08251ca5d018456baa4097c632be29885ed6f89de82482c282b15f9777cfc21ec5b342a25e6836 SHA512 568baa3112199ef0d3beab20ab37fa7e7c54e25b91285b86f27665a987f3303258ff78fe2682b67c22cabdd3db0724387a9d85f6284b1c059ec709c113194e1f
-EBUILD python-3.6.11-r1.ebuild 10339 BLAKE2B fd9c502124fa2e50105246518436cb0758274ad5bdf5d5c4969b5ae40abbd620edaf89dd3d9df03aa948932fcbc01d0b9daa28388f0f5864447fa1afaa65a803 SHA512 8bb122e6c9641a1d3c23eac3b1b7c32a61f5350f71d52520ad2333b1b202c7d871d02480b967fff59daca48d207a490b8378f8fe64210c69edaafb5809842c01
+EBUILD python-3.6.11-r1.ebuild 10337 BLAKE2B a09707d5d31db2394f019f3abfef2788fb3af52bd4e37316d1e2b7e24e5bd1ce589529be248e8e03a0c3ac885a6e9f3cc3531453dc725c7c6327636903749796 SHA512 4981c83efb5a924875121b9a9710c601c78010ee2fb8d326cd5e2c7960ec791ac965291599a89436b818330a64431a47551923fbe29d682ef91a1279c704a9b8
EBUILD python-3.7.7-r2.ebuild 9877 BLAKE2B 182391402d72a38090801f4ea95ddcc26385bfb6174d7fffe6d0acb45fc735ca62d561ba64b324f2e6d64761f51ec18dfc1c4f04abe131138ebe8985b927fd2d SHA512 39fed5b175cf581371ae4150c539e4a2d1a3d5f7f247d92147c49fd8cd7eb231688d7507b1efb10194683834b37697c5f4e6721bffd592ca8698355fe9670a58
-EBUILD python-3.7.8-r1.ebuild 9886 BLAKE2B 8e35b0f14abad8c5106085326fb9cc3adb059ac5484e475021e43644a10cd971452234bb2ebd966c2094b5c19710ecfb1850c216e96bbd46c76f0e68223e75ef SHA512 d70611f3d1076854db92c131b7e85303fb346ab5a5a2b8f0af3eee36acf90636e89bd4a3d8c21a2c042a8b80e1df1e016d32fcc5f317b6b5ae5790d35f7925a1
+EBUILD python-3.7.8-r1.ebuild 9884 BLAKE2B 1adb7c3ddc0f527c7a11f848b73e6aabd492a5a857daa91ea0a90f9c856b24021b420bff28a07abb314c9cab410efd2eefeef39b27e1323880a71f8a47cc5e91 SHA512 47daebfcb312a55c7210338bb1c0879f01af0069e10ea209311de009c40ba360ebecd2c3d111a9f5dbebdb115f24046f9f3cf8f84dc654b90625328c0d7bce43
EBUILD python-3.8.2-r2.ebuild 9928 BLAKE2B e131852b497fd24ecf3768cfaff2188e499a0ca0700443a146b26a0b2e38c1c83a0438455f22afa45f7eaeb96e744bdce9a1530ad831fe929ed561f3f0cc84a5 SHA512 b43d77bf74b18d4d758df5b6399cc38e5edfd52d1652f5b5c0d6083f22ebd5f880e4e5a12244895300aebd284863e77d0318c053b0e87e7e6572e88ec6b5c15b
-EBUILD python-3.8.3-r1.ebuild 9933 BLAKE2B 7a2ad4fd59e15e02b5492ae05da8a6ad85103d60ea9f56b540e0166c8f7cbd4cb92c2a56e858a934338a0a66acee077a7d107a8a326e985a986e723a09709a09 SHA512 9c5a85bfde9ca5feed4d11d949e709cde6edfeeb1d3792b4f80eb6b710fdee8d733ea323365fd9d155b1ba9300c087f567abf9f9411d5b9fef76622832084f70
+EBUILD python-3.8.3-r1.ebuild 9931 BLAKE2B 93864070b2bf1f2a83c9e17d19f95340101eb3786f608e529b987026e86b8ad20bd678fbb7b2020ce62d9901a7800aaa277f7d02085af0a93471d6bde6139179 SHA512 de0c7bbc277cf8f99174bbb3f685b0b57d33e290e625387582d35f1cca78407500474bbe593f04a2c78e42ba749d5bb36d91f4a6dbf86510b42f14cdac5dda87
EBUILD python-3.9.0_beta3.ebuild 9219 BLAKE2B 7901178a271e7e6bcb8cdc8d7dfa39475fe1f77c298d6222e0aa1a9dc32f999b49691c14102ebb755bf9fef85717fefe1a10b5bf6d2988f8783b6944cb56c989 SHA512 7d05c62b192e2df79c0ed74ca13054f45ddd9c0f2fa77aea0c0ad805cf70274678f8282a6fe7d7f890cae52a07971497c471510e1f1fb1555ee7177b93ccdefe
EBUILD python-3.9.0_beta4.ebuild 9219 BLAKE2B 7901178a271e7e6bcb8cdc8d7dfa39475fe1f77c298d6222e0aa1a9dc32f999b49691c14102ebb755bf9fef85717fefe1a10b5bf6d2988f8783b6944cb56c989 SHA512 7d05c62b192e2df79c0ed74ca13054f45ddd9c0f2fa77aea0c0ad805cf70274678f8282a6fe7d7f890cae52a07971497c471510e1f1fb1555ee7177b93ccdefe
MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-3.6.11-r1.ebuild b/dev-lang/python/python-3.6.11-r1.ebuild
index a795fdf6cdfe..bc8153e65963 100644
--- a/dev-lang/python/python-3.6.11-r1.ebuild
+++ b/dev-lang/python/python-3.6.11-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.7.8-r1.ebuild b/dev-lang/python/python-3.7.8-r1.ebuild
index 301564d7ccd2..8ab8adea2b74 100644
--- a/dev-lang/python/python-3.7.8-r1.ebuild
+++ b/dev-lang/python/python-3.7.8-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.8.3-r1.ebuild b/dev-lang/python/python-3.8.3-r1.ebuild
index 729a2f0558af..e0ea8b4c4022 100644
--- a/dev-lang/python/python-3.8.3-r1.ebuild
+++ b/dev-lang/python/python-3.8.3-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index 75f7ed20bd02..bc9621ff41f2 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -2,8 +2,10 @@ AUX rakudo-2016.04-jna-lib.patch 970 BLAKE2B 28947a57089f3e53333d6dad83b9ff62411
DIST rakudo-2019.03.tar.gz 4128971 BLAKE2B 0b1eeb4ebcf7abdbc477cf1b64a6b1f85821e03a953b71aca53ac4fdc88bf3c8df0ecbc95c687ab6686a4cdd4ddb6c7caf89c97ed407d4c0b45203b65397aa11 SHA512 c6b77bbc7d806a399adccccc98c273063c90756967769cd288a161317cc81151dff4feb1219b534aeec5d60e4344fd1f7e166cfc3b90389fd550b2862178f447
DIST rakudo-2019.11.tar.gz 4651014 BLAKE2B 4e95b834d074efcf515e4b1e6776ef4a34398dcc4536e315b759dcb56565e64e19e2cf513b97b85974639b3c3b9968129a6781bbafb37fded98f108c32d06ceb SHA512 6d058fe1e1630023f14ac910ade75f22b963f9eb8e524a8c9006a6df8e0764f283f2c8bd4af4a303b2151e6078fccd8b3cb6c388f70e38d6e9465505eefafdb4
DIST rakudo-2020.05.1.tar.gz 4802231 BLAKE2B ead9db815bb29d78f4a92157ff65e43c28f19e52e19f3972783b2a8d6c1814576c30d5b612e12f1500a7ae436c66b70d9774aa69f2ea421cc4382341cbd40498 SHA512 20d0818fc9f13693f098c41799cceb39e21442ac652993981fcab1fc1c7158058b42746f3ca3b145938fb6adb03f045f4784e77bf11da672c5908d0a5a36975f
+DIST rakudo-2020.06.tar.gz 4828268 BLAKE2B 5be85b3379f8f859ccff860cfbb5cbab23befd3f25175ae300acf414477f73ef9c2da8ea66a4516339a6dcddbef79d18ee3789e009619bdde44eff6a69cb765c SHA512 2eb6f4eecb2b8fe2cf94ef0309baf4f91cd4cdc7adb428e1023e5b84d804e34a5249448915b40d8120afe21dfb5bb1cb65c128d2b2f1afa3d98d84c97c84caea
EBUILD rakudo-2019.03.ebuild 1641 BLAKE2B 84b7903b29f4257bd634e9f01b9012339c9dc877dce3b0d4c232a593f527180b266ee9579b2964bbd2442a750ae3b4c22f75078b0af6b3f2d02843768480c4f8 SHA512 6631c3ec81979a5c7957eadfc2ddb90ceef44726317f1da9d1b0c09b3791521f92ec7723031fe58c3deea5ee53547935a9ef31642f2953d6410ff686c6debf51
EBUILD rakudo-2019.11.ebuild 1641 BLAKE2B 84b7903b29f4257bd634e9f01b9012339c9dc877dce3b0d4c232a593f527180b266ee9579b2964bbd2442a750ae3b4c22f75078b0af6b3f2d02843768480c4f8 SHA512 6631c3ec81979a5c7957eadfc2ddb90ceef44726317f1da9d1b0c09b3791521f92ec7723031fe58c3deea5ee53547935a9ef31642f2953d6410ff686c6debf51
EBUILD rakudo-2020.05.1.ebuild 1632 BLAKE2B 986fda7851e41d16434c112fd72056991cc07aaf18104918ae76bd81296866ce16af53a82e22db508f219de9aed5f2c32c7a71ba214d9931c1fa0839b0e054d6 SHA512 7d1f15d9fa94b666b6e4862905e2488ba1fcfcd5a8efd297aa8ceb388359036d329ba5d5bc5d4920094e6dabfa527ca11c5fbc08d556b2ec213bac7b6d648064
+EBUILD rakudo-2020.06.ebuild 1632 BLAKE2B e2bdaaf8c2c1dca93e6c9f5d7c6ff76f2681255d4c55ee60d2edb77833b29f1e2d2b0e947e139e28ba02acbaf35b95a7b99d183ec68d306998e72e49d7fdb6f3 SHA512 1cbf785efeaca5721fd547a1b953d665cf2dd28896324229d2a76252aa720831386a3c677414e81df530ea3ab8ea3e149d29461c668b999d255e845724b6774b
EBUILD rakudo-9999.ebuild 1746 BLAKE2B 825811a2641e4fa2290771caf47ff2a5c4e6253455bb0b5fec85d1a910e952e597fca38f57aa6b939f4bb55aebbab14a30bad08bda8448d3dc3aa50dea81ccbd SHA512 af56d0da89afb6f506b6fd041692e1d798b7832d5684021aef6b9fd8d5d51336c4751e3cb9a6a906930f3ac115514098a83943cb0ee4a195f6fa5fc5027f7791
MISC metadata.xml 513 BLAKE2B 90fdc5cdf5182b707681ce28a7e4b06c1e8e1a05f848e072de4abc5e8f074ec9becd41c117880bba60e00eebe69a4ab1639b39b0a29307d65d6be09784ee6a18 SHA512 d0144523717581bc13a12b8b8edff0ec03800fe1bda313725a4db37bc70e26c3cf566426e48eb6ecf58f8653f6c51f375ea31d915d75bcf37fc0772251047e7a
diff --git a/dev-lang/rakudo/rakudo-2020.06.ebuild b/dev-lang/rakudo/rakudo-2020.06.ebuild
new file mode 100644
index 000000000000..1353f67155bf
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2020.06.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-opt-2
+
+DESCRIPTION="A compiler for the Perl 6 programming language"
+HOMEPAGE="https://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://rakudo.org/dl/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="clang java +moar test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="~dev-lang/nqp-${PV/.1/}:${SLOT}=[java?,moar?,clang=]"
+RDEPEND="${CDEPEND}
+ java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+ clang? ( sys-devel/clang )
+ java? ( >=virtual/jdk-1.7 )
+ >=dev-lang/perl-5.10"
+
+pkg_pretend() {
+ if has_version dev-lang/rakudo; then
+ ewarn "Rakudo is known to fail compilation/installation with Rakudo"
+ ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
+ ewarn "then do a new installation."
+ ewarn "(see Bug #584394)"
+ fi
+}
+
+src_configure() {
+ local backends
+ use moar && backends+="moar,"
+ use java && backends+="jvm"
+
+ local myargs=(
+ "--prefix=/usr"
+ "--sysroot=/"
+ "--sdkroot=/"
+ "--backends=${backends}"
+ )
+
+ perl Configure.pl "${myargs[@]}" || die
+
+ if use java; then
+ NQP=$(java-pkg_getjars --with-dependencies nqp)
+ fi
+}
+
+src_compile() {
+ emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
+}
+
+src_test() {
+ RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 34957ae73677..75fc6cddf531 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -68,7 +68,7 @@ DIST rustc-1.44.0-src.tar.xz 94754392 BLAKE2B e46da2ceab4ba596ef693c2e7433e5faa3
DIST rustc-1.44.1-src.tar.xz 94756856 BLAKE2B 60f536c3ba0fa1fec4b6333ee57809ee5226090ad5041c14a136b4356ff3b898062e06c3fe54effe873e27931ac8fcb902cd48a38615a8de7eebc6ecb3bdc2bd SHA512 1c17002edae844a710db9b144c17171416330dc565343c65af8a6e112fb61555e2025bb4cf33cac1229d7df689e6ff8858b91ae00552400ccacafaf1de11849b
EBUILD rust-1.41.1.ebuild 10136 BLAKE2B aa077fba0ef2427383552eb9166acd6327a64af942756e2ebd745cec97aec030fa30e90e9522001ed2ae83b6965ebdd01635c9f0906d3614ced1337cf4e49507 SHA512 454a6545398497b192b8ee6b42c493f7f93a35121efb3ddf68287992cf40affec1445de538d97771582a8e689d2af58154688cc7439aee1659b95564a8fb2eaf
EBUILD rust-1.42.0.ebuild 10587 BLAKE2B d676f08d08c81b0dd876bece70e66c99979df6a011d09daf1c93d58fc9f6b8bec25a8a5ad8084eaa69f59f07b1b3a22bdd92ff5226bf4af1cc9f872130c051a5 SHA512 06e3e9b74283ae30fbd1ed7747ecb7a77c2f7af6a8f8a56c1ba42499c7d939d0df6e1bd79d6dc25e9b423f4464d899209606fe5d3d4e0fc0e6d4d2308ebec53b
-EBUILD rust-1.43.1.ebuild 11453 BLAKE2B 422593c3f78f18fe63b3fded9f04871afb89019fb2e98726f19906fca7a16335d55aa35c7ae967412847fdd776ad88315648f0f132065c6f231ecb4768b51e5a SHA512 3d5902c19cdd7207acad042ded4fa5d7bc5250e07865fd17c5f826fedaa7a2160a8ac3ac483b09604ed5a078d1f1774dba664ba948ab39bfdd41ac6fe7b4a8e2
-EBUILD rust-1.44.0.ebuild 14712 BLAKE2B 369613de5eea49b105ebc645e34935bc1d00ec9ee3a30e525bb6589b993a8812cc33a8f989700d9705e891d33833f488fd7daca07a1225f5226ef00f1c7394bd SHA512 42be3030a795feb652ad70f0b04fce995f76a3ed6f3582698ca40fa127222a496162f0cc50a783dd6f030292df51f66d59bacfa681f974fb3d0d2a551394e85d
-EBUILD rust-1.44.1.ebuild 14917 BLAKE2B f57f49337dcc1821d06894d6cdd9a9f2265d22afcda796d3ec9c02d27566086ed896f2dba3d720c62df41f6d700f4d9f69feed0cb111a8b52672fc34b084ae65 SHA512 1ae01e81eb06b24855a749c3ab9ae9a0abf102b4fb89c735136fa947e4d487caf94c4fcb032d7f3c758d6478695a52bd8a77242b9d90b4ce58ba914fc2e2cc57
+EBUILD rust-1.43.1.ebuild 11453 BLAKE2B 661137dc79f5ed654d230dc70a569e44f60b7d15964d9d5a6624362e6ace88643c0e59df58029e426577627bff91a6125466e977cc8f2bc9a3760bdb3f712281 SHA512 c804e31ef85a9fbef2e2e15004120134ae4c0a298b6926e532d80ce0a7d93dd59a1abab9022521f83a571f34e2c9b4fa8b62ed977454e920397a28c5a0f28e33
+EBUILD rust-1.44.0.ebuild 14712 BLAKE2B 515aa01d3b484058334375442ffb1ceb70fa61fcf3ccea730d444647649781a3da2a3a226843a2168d343add6b718758ac6f34a909f183c74e530d7cf29c48a3 SHA512 c8fcc5688b2981b947275b6853318bad51c4e5a109a801cdb22e2c57d2b6cc9fb50d05762b59dfbe047c8cde65e8b9f7e3ba535436e1eea1f992782af263f693
+EBUILD rust-1.44.1.ebuild 14917 BLAKE2B ce55d88b240f7c562ef318ba6755e62c039e1beb21e2dcc060a5125f4f6380b227e2bec8d8e0b90122d47eb065db92cab9c3ff9eea7a65900e82bf008007edd5 SHA512 38c94f963477035f832f586102eb92207ddef27f54f311c3f39ce3758adc49eff62190944355ac5af580b7f38f7534ff1c72ef56b7c2de5cf854e0d4aec410ab
MISC metadata.xml 1083 BLAKE2B 7a7b093c22dcaef58bd67f9c2fd84a000696b234d2bc27315999bf6751cfd2a79441fd22efc284a542ecc84ce1a12ff9ca3495d249eaffa5bc1722b385c6109e SHA512 bfe8c140753e93db67244c92e9a7d193691ceb67de796c30a851966a1262bc5c897ead6e13d728775fa524215b6851609dcbee582022d9d75bb8d1e6fabc4ef4
diff --git a/dev-lang/rust/rust-1.43.1.ebuild b/dev-lang/rust/rust-1.43.1.ebuild
index 9f54ed8a0668..b0e600fc3a17 100644
--- a/dev-lang/rust/rust-1.43.1.ebuild
+++ b/dev-lang/rust/rust-1.43.1.ebuild
@@ -60,7 +60,7 @@ LLVM_MAX_SLOT=10
BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)) >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )"
-# libgit2 should be at least same as bungled into libgit-sys #707746
+# libgit2 should be at least same as bundled into libgit-sys #707746
COMMON_DEPEND="
>=dev-libs/libgit2-0.99:=
net-libs/libssh2:=
diff --git a/dev-lang/rust/rust-1.44.0.ebuild b/dev-lang/rust/rust-1.44.0.ebuild
index bd67db4cdf4b..0fabc3bfd234 100644
--- a/dev-lang/rust/rust-1.44.0.ebuild
+++ b/dev-lang/rust/rust-1.44.0.ebuild
@@ -60,7 +60,7 @@ LLVM_MAX_SLOT=10
BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)) >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )"
-# libgit2 should be at least same as bungled into libgit-sys #707746
+# libgit2 should be at least same as bundled into libgit-sys #707746
COMMON_DEPEND="
>=dev-libs/libgit2-0.99:=
net-libs/libssh2:=
diff --git a/dev-lang/rust/rust-1.44.1.ebuild b/dev-lang/rust/rust-1.44.1.ebuild
index 1ba3a231d20a..b22d273aed99 100644
--- a/dev-lang/rust/rust-1.44.1.ebuild
+++ b/dev-lang/rust/rust-1.44.1.ebuild
@@ -60,7 +60,7 @@ LLVM_MAX_SLOT=10
BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)) >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )"
-# libgit2 should be at least same as bungled into libgit-sys #707746
+# libgit2 should be at least same as bundled into libgit-sys #707746
COMMON_DEPEND="
>=dev-libs/libgit2-0.99:=
net-libs/libssh2:=
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a043c21244df..0adb6aef8ab8 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 6eb32a084b64..24e61d08dc28 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -4,4 +4,4 @@ DIST Botan-2.14.0.tar.xz 5958948 BLAKE2B 90e73945b22f6e4e8d6163bfb45eca153eb1495
DIST Botan-2.9.0.tgz 7216373 BLAKE2B 5ad2e15db871ccc3a32b29b7f54a02d69f251f0aca2ce656b557dbbb3814a793053a54905371b3414ad72952a64bece43e2383da91f205f68b0fe31be2f9439c SHA512 b88f3894a4a5b7b2fbff9be6eb0b774bf679a014bd2364811b7e63d4f323e22ca9ef916491afbc2cdf9db68727c1449fbeb6fd417e591560add0955517db3f65
EBUILD botan-2.14.0-r1.ebuild 2708 BLAKE2B 5ef16c8ccbb43488a9e06641f9aff6d9b7ab6f8265c2c4a007325181a6a01c1ad9553ecc70b646273bcbf7680640013e692ccbfcb80d037d3b52d2a9d2ed8f24 SHA512 0b57b3c3550c02ee0d4c3deb8ef70f68e202c04811235de8a8ab92d55eee2d548d041f0b1971d68e039a2dfab3c49273d545e0a42a7203121b48856d53af6241
EBUILD botan-2.9.0.ebuild 2520 BLAKE2B 05a0f8bdd64a4f1c5cdfbcaf2c25e2c104f6e2f2e530836f1c1b3bca690ab10e68acf6a8dda28bb74ad48f571472cb406c7bb46eddd0f6471b26a7b9376b4cc3 SHA512 fe4b4d40ddf86130ccfd96601f885447805475a0e66f1f2cfc1398b454269567feaa83480935a52398e72a76aea2b8d7b5284caca8092e77d0500eccdab4ff7c
-MISC metadata.xml 492 BLAKE2B c8e3a6426a1aeaeb0695e8ea5217d6ff49210ea5d81d842daeaa433535f57a487d04b987d59a548ee44ab45b66c5da2f4d64e35a445848e476d415ffb0e88305 SHA512 80160b6d84260644b66622005766ac2725274109aca7d29814e5e544cbda51ba35ceb3162bed329aeeca2ebe9299af4c77fc3f32fef7b08bbc8e2889a4a6fb56
+MISC metadata.xml 375 BLAKE2B 0e93cbece980a5ac4b61180e528331e57ff6704538c0fc98721801be3bff5640d0087b8509ef7e098ccd311e1bb059b0722bb2c73f09ff9a4fcabea3a1948358 SHA512 8db7035531a16b1f90c7f635c4a65e837ff9afa5fc940e3f097ab402a5e63d444daf1f90bbbbb14740115b1f42dfcf2ce0ab4b16b4d2359a44d0b983ce474321
diff --git a/dev-libs/botan/metadata.xml b/dev-libs/botan/metadata.xml
index 7c277893487f..3cdf3d035044 100644
--- a/dev-libs/botan/metadata.xml
+++ b/dev-libs/botan/metadata.xml
@@ -2,13 +2,9 @@
- sam@cmpct.info
+ sam@gentoo.org
Sam James
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 974c9a5077b3..0d3da4ee6f7a 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -3,5 +3,5 @@ AUX c-blosc-1.19.0-xgetbv.patch 1088 BLAKE2B 45e9d6c0e3a166d7c2cb41381fa9c75ca19
DIST c-blosc-1.11.2.tar.gz 633280 BLAKE2B 426de12ffa0db784fc26316e5758836517f3b3498111cfea64ebd2bc4582ebc6236f64845d41e75db272d3741ab8a7f22a12e0847fb7c98ba10a3ae2c2906e22 SHA512 c1282f60f4ef9d24844be225587e7f46c43ba8a5071f5ee49a7326bce9e84b65312c4f9606e78fd3d1209a4ca50f1c31312a7c377caf9522c9915177c92a4d7b
DIST c-blosc-1.19.0.tar.gz 875356 BLAKE2B 046134e10fec639f1271d9c7cc15dcd239f9f0875f7ad324144338072e6fa006612f7d154ccde11a5dd7ee60471380aab4a60ae332cf1de4a7b773ae354c494a SHA512 15bc009f8880630c531ccd36544869d59b69d21f10c08eebf3c2983d203697429649a1b56b044e28342ec620c6f5850ee9da783005ce83f23e783f091289498c
EBUILD c-blosc-1.11.2.ebuild 1320 BLAKE2B b1b00873c35709d160a8b4af70c53aa1db292d114e85367840666a54af0b0f09f0e4e2b4c19960f30b1d50278c87909495ff202866b233fc28c8be231ea5048d SHA512 10b361c01cb2dedfc5889d37e4043d9b2aa2f911057a60560014b3823df73d59afee2aadc5c07452e9e0e75426d8c1d8007b9df3e020acdda7a3162ce0c3f43e
-EBUILD c-blosc-1.19.0.ebuild 1118 BLAKE2B 859e3bc10a3e41aaae24c541d64fe11a0b6d65351b8111d18914c6ff71179a656c06a31c22d22b553a9a8a7d0731845c4e3e79df46ec35b57ea4e02853a509dd SHA512 697297004aac8f9904258cd5876d3cb3a938c2acc156d1ed8dc03228b5cd59110030b402d0be1701e8bfd19ddfdabf1739e809f010b8808436e69c2722368934
+EBUILD c-blosc-1.19.0.ebuild 1123 BLAKE2B 22269c31a0ce4003d2f4aa3ba1ace9ad9e65a872144ad0671726872ba1607de34aef519cfad60fc6bb06e8c4dd1056c5548556fe0c526720b1919b56f726b6fa SHA512 a81a0489d1ff7f5417deb78c12112cbfe097a7c926f372bf2c80855a66a395b4f1d1200f0d4a91d374ca61e43915f80e89e622d7b4d795a94ede4e056af35aaf
MISC metadata.xml 838 BLAKE2B 3dadd7fc571618d6b398e434354b65a7c59dbe07d2530069ac9ab7f879cc5b16407079a4e1fdbd54110b3be9a0bf25c13512c2030fc9042cbd105d9b294dd279 SHA512 5c1f4bd8e4ef92dbef6d9a6418fbdab91c377c275eeb572a0c0e785a25f342be0dd032ad14106b9139fb7208064f16fb428ebd7b65d50d35b87089244b026654
diff --git a/dev-libs/c-blosc/c-blosc-1.19.0.ebuild b/dev-libs/c-blosc/c-blosc-1.19.0.ebuild
index 71488e42738a..aab6138ba02c 100644
--- a/dev-libs/c-blosc/c-blosc-1.19.0.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.19.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="+lz4 +snappy test zlib zstd"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 0d0ed0f8eaf2..0fc05ca72483 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -9,6 +9,6 @@ DIST elfutils-0.177.tar.bz2 8852413 BLAKE2B 03f432342651f7646d73b7847325bd14b722
DIST elfutils-0.179.tar.bz2 9057637 BLAKE2B b34f5af6d2a6613622f4d5da78b9ae10e60800fc91cb4607115fcaaf90c1c544460fb02e164f87e52951a446d6479909bbf3aa02b7db78b26af7863290de8848 SHA512 ff2d96ad1db08e3a2ddaa60bd5a05e9b61ffa71d646f889cebb6bef51322e874930809c6dd0a257ced8c6e8de4b59ecf13ca6741dc68f9400293208278a0c052
DIST elfutils-0.180.tar.bz2 9079640 BLAKE2B bd7863b82a71d2932a23c9d125d5eb6485977a3256a8a0b25980183d33f7345c3d9fae78277de5c955eb0ceeb955f8fa71d209f4f39bcf6dd49e46a8bbd7efcf SHA512 62e96035ccfe8928baca2285decbe8b8703a2daa956df81ece18fecf643272fb68955806b3e807a514141a7a9bf44520bf09461672aa580bd6807485fb604d25
EBUILD elfutils-0.177.ebuild 2156 BLAKE2B d2455d04f65331456093f5a43b9e1ec06c0ae2ee2ec8073e6db3a1451aa1e6a3ed43834c181fbc7c742d77638ea3746d9f260e8d3ba0924f2f1edc56b05c6b42 SHA512 01011fc1c148a173ad401ecb0d067e9f051d0a37e9c1bc965f7bc6b7d07ca5b69b811ddb7af613e2e95eed768adbca4ff9e16ffaf48bf513017898cb79985fe6
-EBUILD elfutils-0.179.ebuild 2372 BLAKE2B 0fa71dd212734e94ab1717002d753cef3f4ab6a6f10e0bd065aca7d625c0886328ad97ce8f226548dbd19436580c22679cf452ad7bfd31912a98836e88cbead2 SHA512 5404d8ba868368efec6eb1c7afbc7bad2d0a0e6493de7e4c7f0c6a6d35ae4c27ba8eafb9688234a65bef2b3b8c381dd8a604c3bc27b0370ace8acc967a55cdbb
-EBUILD elfutils-0.180.ebuild 2415 BLAKE2B 36ffa0112e7a94ee612414a107de9e762b800679da8ca854f3e44ce209dcb43349de6745fdda643bcc78f6b4ff89a9db5d91f439653fd7cb52621a25cf575f41 SHA512 bdda45f1343a8f0bc5cb382177347796522f45bdd60fe4f3c97d3e2d44eb8d38d6f2fd176c32b503d4175f6e63c37a514b355bc454f51d385bc5f845d0b6fbe3
+EBUILD elfutils-0.179.ebuild 2385 BLAKE2B bc45f52b7154048de4424c5083209ac0ccff1b16021de0ed94f16344a5af9079de737ccca29b3203d3c96e2be691164e11ff558599892f459493e0d85cc6f253 SHA512 9363ea4b6e3da356227ce18208d8dd7807a63b852ccba45cafe9a12e865e86a8e8dc9d0f8f84a92d3aaab2f4e72fb93848453799458cd8f09d5b7ffb31df3d7a
+EBUILD elfutils-0.180.ebuild 2431 BLAKE2B 6dc0720cc3f45182bad3fb9acc7e8de906acdbf5c73eccc7555f4a4c00adfc446e9b20b5a2ed949feda35048a0d0b0825ae978a1f544c20d91f7f7e74c1dcfa1 SHA512 0dcf3fe580e0e75ee18aa0a36c1c7d1cfa86c2600c8a661d540d79e059a9ef5f4348197cc9ee1056684f504de91a9355900d018cd8a5612ec328c738c8cc0597
MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.179.ebuild b/dev-libs/elfutils/elfutils-0.179.ebuild
index 0ebf36a8d08f..4795037c5c3a 100644
--- a/dev-libs/elfutils/elfutils-0.179.ebuild
+++ b/dev-libs/elfutils/elfutils-0.179.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic multilib-minimal
+inherit flag-o-matic multilib-minimal toolchain-funcs
DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
HOMEPAGE="http://elfutils.org/"
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind"
RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
@@ -70,7 +70,7 @@ multilib_src_test() {
# CC is a workaround for tests using ${CC-gcc}
env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
LC_ALL="C" \
- CC="$(gc-getCC)" \
+ CC="$(tc-getCC)" \
emake check VERBOSE=1
}
diff --git a/dev-libs/elfutils/elfutils-0.180.ebuild b/dev-libs/elfutils/elfutils-0.180.ebuild
index 086304510f1c..02ed19a4fe4d 100644
--- a/dev-libs/elfutils/elfutils-0.180.ebuild
+++ b/dev-libs/elfutils/elfutils-0.180.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic multilib-minimal
+inherit flag-o-matic multilib-minimal toolchain-funcs
DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
HOMEPAGE="http://elfutils.org/"
@@ -71,7 +71,7 @@ multilib_src_test() {
# CC is a workaround for tests using ${CC-gcc}
env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
LC_ALL="C" \
- CC="$(gc-getCC)" \
+ CC="$(tc-getCC)" \
emake check VERBOSE=1
}
diff --git a/dev-libs/freexl/Manifest b/dev-libs/freexl/Manifest
index 2fb027ef9788..623d321b6fda 100644
--- a/dev-libs/freexl/Manifest
+++ b/dev-libs/freexl/Manifest
@@ -3,5 +3,5 @@ DIST freexl-1.0.2.tar.gz 939064 BLAKE2B 7c1e4f089dfa499aa8966d6e8ddf1a534a8542e1
DIST freexl-1.0.5.tar.gz 938994 BLAKE2B a3d2667271f6ab3de61a90f75ba8f7a645c5eddcd7f6d452fbbd59dc211c4676bdef7f7772235f60898de1e0a6d2e4951a3eadf77c4766bf938f5d8465f9de42 SHA512 86d742f58353be1f3ab683899a4d914845250b481acc078c769ef337d0a6ea24d25501a3e7c73b95904c6839ddd35f53e58ad4eee0c3b433caa84db0a8c6462b
EBUILD freexl-1.0.1.ebuild 568 BLAKE2B 368ba6e8f3c26a029bc110b0a37e971d3ecdac0fdd76a5d84d7e5b012ece4f83cdea87a4456cb111575a81bfa68cb2cf302045097b26f21ea6d18975b4f39e9c SHA512 cc20af12c264ddc631d7ff64e2b1f300b42561de263681904b5af97d401afa074b1e0ec9d58b314f957f8439d3e3a64807a20c667d632b76fb0722704dc09279
EBUILD freexl-1.0.2.ebuild 579 BLAKE2B 6deb6bcdeb8ab8504820d6ba7588a59f298c73b7597d335ccde2e7a74ebf4800b51964f4cfc392ac4017a60e6b44a170683b67ddf0c802f8aba85fe9edb90c8d SHA512 ed90cea0f68d529f904d1fe7a6459bf1029b1eb216836ff858b136e03366418a45f1ce80c11783a5aeb604bbf7adf6f85fcdc0f7c6a7aa599abcede54d187803
-EBUILD freexl-1.0.5.ebuild 536 BLAKE2B f74a95b3f0f7a804f9a79a466e789518bdd9d247b7137cb075b1a042c94e5e9834b1e776140632a390018fda372e5d52c135ea4f8f91b6a48875ef097def9f3b SHA512 f9e625ae7ac207c151b6aa64376a9aa283562dcaa6f5799d4b119bec717d3b33cd2c23e5374aae2c99243bf9d655c8d9961a3174f3f11550bd816e191528c3c1
+EBUILD freexl-1.0.5.ebuild 534 BLAKE2B 52eca15f9a6e32c3fb7a6951ad8997f6ca4116ad08d5e625f74c486f1a6a16ff525abeea116f2a2e8eccd2da1f13c63d14870775083a056392e7f38639a2848c SHA512 f6316c2018f9f736438527a69e3f8c437e6f6f67cb3e528628c6badccdc1c6002810c58d13a2612c45679d8cfd54e8a1f4ab448f2e2aa0a95a18a87a0defbf7e
MISC metadata.xml 269 BLAKE2B d4815f943b682786bd83cbc5840e99f36fc2f1bf175394ef9389228bfa8bd22b1bfbbf763eb9c396338b72b7927b431e73598bb67eaadf1d437c4afa5877c189 SHA512 9877d09d42c801d752617b41c7fb790db8e10c033c02ee9fe9a04fa1c6a8ea06d3baeb4f81d041b57e883d5d9dadb429289faae90d0293c62334ba35549e0276
diff --git a/dev-libs/freexl/freexl-1.0.5.ebuild b/dev-libs/freexl/freexl-1.0.5.ebuild
index 593786c9ceb4..329b874db4e2 100644
--- a/dev-libs/freexl/freexl-1.0.5.ebuild
+++ b/dev-libs/freexl/freexl-1.0.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~x86"
DEPEND="virtual/libiconv"
RDEPEND="${DEPEND}"
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 495555f1c404..142c7b37bc80 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,7 +1,9 @@
DIST jansson-2.10.tar.gz 487855 BLAKE2B b1d83ad1a37e66cb7c497284a7958882d5a7e13cec2260d9cc2b5eaef648feea66b70305dec9193f10cf77f37bdda17605277ea41735708ca6a9898b79fef807 SHA512 e331d5c097b4acb0b1df7d90d1d3453c26bd34bfe2e06af0027665bee9efecc2bc61cc7ab5b70dab1262bf80a3315ffb53b4176874fe07e20eee4b9ea7071d44
DIST jansson-2.11.tar.gz 483686 BLAKE2B 873283a1b41eef1c57fbcb3d4cdb8c33b850d95ee93c800cbcc009e3e9c9e87278beff11800e63894087e51c767dcbd555fbde48163376d53be2bf72b2eac72d SHA512 0ae77cf7ec264536313639458ba20b66e221078cddd209df3ce45c895b897799954abc1ca4b0d5993b974135652804be6bede2825503469d56303470888382f8
DIST jansson-2.12.tar.gz 489154 BLAKE2B cf6bc6d03daba921ec5e033bf57ff0055741cc935adb14d5d4a5f04056fa93c292bf88367db071ef7bb32fbc5d2d6f5f2ce658815a17939bd38ed5c0676ad091 SHA512 e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb
+DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192
EBUILD jansson-2.10.ebuild 842 BLAKE2B af64bdad4ba158adeeadbc300150a217e9f3d20467f23191f1bea15fab3da644fa9e266438fb5678f56667ec60a7dd1b55ffee93d3ddc2986eb0dfdd66fd9fef SHA512 453a1e121cf054b395c209e30632fa0710e023c0b1bfa2452bd14696f87ef9273b46f3a4f7def1cab9f65a7270d7b4929046ebcca3d8294ed8a5511723e2ea44
EBUILD jansson-2.11.ebuild 817 BLAKE2B 99ccfd23b44723da53c5e82346397d8871eb04cc6ceb831994c65b8133659f57a79db6d7c5c5f8d4994e37e9209777e1c6fc250740e9a82bea7f1123052c9c0b SHA512 62794ce12be688f3e793f3155b7aabd2af7d063ad8e6ca3bf322f15876a0c056eda0276a9ace6c9252e34afa753d5e73dcb05d013324737d64777c757ac35002
EBUILD jansson-2.12.ebuild 818 BLAKE2B 5e1ee5ee234953e767ac251ae83598f3c6e7fac8a24543e27c36e4a4ad64ee7e904f5e1c45079cb0d395b1786361725d7dcfeb93e401e894c09648e456e57908 SHA512 8e101a47bffb7a125ce1402b936a8e38b88fd247fd9497b355a741380608ea403f49d991a33e9510b40c566c5ef8b3a54fff9678ba9addaa6b4cc7862f012965
+EBUILD jansson-2.13.1.ebuild 891 BLAKE2B afd3ae0f565b15b21caf145772d0e18d88233e48bff6e5f108f7a1c9ad48af06c7dc962557bb930b1121976ae19ae3bbfb1c4cfdf8a16c95fffb65815832bb9c SHA512 0119aad5dad85732f2385466f74b4bfb8527cec51e706adea00938e5f63e64acad1317a34d24daf3f736d9be28763b142ea3dfa5f1d1ab0616943cece82303e7
MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59
diff --git a/dev-libs/jansson/jansson-2.13.1.ebuild b/dev-libs/jansson/jansson-2.13.1.ebuild
new file mode 100644
index 000000000000..8b9c7d1b6c5e
--- /dev/null
+++ b/dev-libs/jansson/jansson-2.13.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="C library for encoding, decoding and manipulating JSON data"
+HOMEPAGE="https://www.digip.org/jansson/"
+SRC_URI="https://www.digip.org/jansson/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc static-libs"
+
+# dev-libs/jansson-2.13.1[doc]: fails to build with >=sphinx-3.0, #731668
+BDEPEND="doc? (
+Date: Fri, 1 May 2020 06:58:30 -0500
+Subject: [PATCH] ffi_powerpc.h: fix build failure with powerpc7 (#561)
+
+This is a patch pulled down from the following:
+https://github.com/buildroot/buildroot/blob/78926f610b1411b03464152472fd430012deb9ac/package/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch
+
+This issue is being hit on OpenBMC code when pulling the latest
+libffi tag and building on a P8 ppc64le machine. I verified this
+patch fixes the issue we are seeing.
+
+Below is the original commit message:
+
+Sicne commit 73dd43afc8a447ba98ea02e9aad4c6898dc77fb0, build on powerpc7
+fails on:
+
+In file included from ../src/powerpc/ffi.c:33:0:
+../src/powerpc/ffi_powerpc.h:61:9: error: '_Float128' is not supported on this target
+ typedef _Float128 float128;
+ ^~~~~~~~~
+
+Fix this build failure by checking for __HAVE_FLOAT128 before using
+_Float128, as _Float128 is enabled only on specific conditions, see
+output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/floatn.h:
+
+ /* Defined to 1 if the current compiler invocation provides a
+ floating-point type with the IEEE 754 binary128 format, and this glibc
+ includes corresponding *f128 interfaces for it. */
+ #if defined _ARCH_PWR8 && defined __LITTLE_ENDIAN__ && (_CALL_ELF == 2) \
+ && defined __FLOAT128__ && !defined __NO_LONG_DOUBLE_MATH
+ # define __HAVE_FLOAT128 1
+ #else
+ # define __HAVE_FLOAT128 0
+ #endif
+
+Fixes:
+ - http://autobuild.buildroot.org/results/5c9dd8fb3b6a128882b6250f197c80232d8a3b53
+
+Signed-off-by: Fabrice Fontaine
+Signed-off-by: Andrew Geissler
+
+Co-authored-by: Fabrice Fontaine
+---
+ src/powerpc/ffi_powerpc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h
+index 8e2f2f0..960a5c4 100644
+--- a/src/powerpc/ffi_powerpc.h
++++ b/src/powerpc/ffi_powerpc.h
+@@ -57,7 +57,7 @@ typedef union
+ double d;
+ } ffi_dblfl;
+
+-#if defined(__FLOAT128_TYPE__)
++#if defined(__FLOAT128_TYPE__) && defined(__HAVE_FLOAT128)
+ typedef _Float128 float128;
+ #elif defined(__FLOAT128__)
+ typedef __float128 float128;
+--
+2.27.0
+
diff --git a/dev-libs/libffi/files/libffi-3.3-ppc-vector-offset.patch b/dev-libs/libffi/files/libffi-3.3-ppc-vector-offset.patch
new file mode 100644
index 000000000000..4bcd27e4f152
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.3-ppc-vector-offset.patch
@@ -0,0 +1,53 @@
+From 4d6d2866ae43e55325e8ee96561221804602cd7a Mon Sep 17 00:00:00 2001
+From: Samuel Holland
+Date: Fri, 21 Feb 2020 21:06:15 -0600
+Subject: [PATCH] Update powerpc sysv assembly for ffi_powerpc.h changes (#541)
+
+Some of the flag bits were moved when adding powerpc64 vector support.
+
+Fixes #536
+---
+ src/powerpc/sysv.S | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/src/powerpc/sysv.S b/src/powerpc/sysv.S
+index 1474ce7..df97734 100644
+--- a/src/powerpc/sysv.S
++++ b/src/powerpc/sysv.S
+@@ -104,17 +104,16 @@ ENTRY(ffi_call_SYSV)
+ bctrl
+
+ /* Now, deal with the return value. */
+- mtcrf 0x01,%r31 /* cr7 */
++ mtcrf 0x03,%r31 /* cr6-cr7 */
+ bt- 31,L(small_struct_return_value)
+ bt- 30,L(done_return_value)
+ #ifndef __NO_FPRS__
+ bt- 29,L(fp_return_value)
+ #endif
+ stw %r3,0(%r30)
+- bf+ 28,L(done_return_value)
++ bf+ 27,L(done_return_value)
+ stw %r4,4(%r30)
+- mtcrf 0x02,%r31 /* cr6 */
+- bf 27,L(done_return_value)
++ bf 26,L(done_return_value)
+ stw %r5,8(%r30)
+ stw %r6,12(%r30)
+ /* Fall through... */
+@@ -145,10 +144,9 @@ L(done_return_value):
+ #ifndef __NO_FPRS__
+ L(fp_return_value):
+ .cfi_restore_state
+- bf 28,L(float_return_value)
++ bf 27,L(float_return_value)
+ stfd %f1,0(%r30)
+- mtcrf 0x02,%r31 /* cr6 */
+- bf 27,L(done_return_value)
++ bf 26,L(done_return_value)
+ stfd %f2,8(%r30)
+ b L(done_return_value)
+ L(float_return_value):
+--
+2.27.0
+
diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild
new file mode 100644
index 000000000000..22591c894710
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.3-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib multilib-minimal toolchain-funcs
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions"
+HOMEPAGE="https://sourceware.org/libffi/"
+SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/7" # SONAME=libffi.so.7
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug pax_kernel static-libs test +test-bhaible"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="test? ( dev-util/dejagnu )"
+
+DOCS="ChangeLog* README.md"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044
+ "${FILESDIR}"/${PN}-3.3_rc0-ppc-macos-go.patch
+ "${FILESDIR}"/${PN}-3.3-power7.patch
+ "${FILESDIR}"/${PN}-3.3-power7-memcpy.patch
+ "${FILESDIR}"/${PN}-3.3-power7-memcpy-2.patch
+ "${FILESDIR}"/${PN}-3.3-ppc-int128.patch
+ "${FILESDIR}"/${PN}-3.3-ppc-vector-offset.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+ECONF_SOURCE=${S}
+
+pkg_setup() {
+ # Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example
+ if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then
+ local base="${T}"/conftest
+ echo 'int main() { }' > "${base}".c
+ $(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null
+ if [ $? -eq 0 ]; then
+ eerror "The linker reported linking against -lffi to be working while it shouldn't have."
+ eerror "This is wrong and you should find and delete the old copy of libffi before continuing."
+ die "The system is in inconsistent state with unknown libffi installed."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ if ! use test-bhaible; then
+ # These tests are very heavyweight (hours of runtime)
+ rm -v testsuite/libffi.bhaible/bhaible.exp || die
+ fi
+}
+
+multilib_src_configure() {
+ use userland_BSD && export HOST="${CHOST}"
+ # --includedir= path maintains a few properties:
+ # 1. have stable name across libffi versions: some packages like
+ # dev-lang/ghc or kde-frameworks/networkmanager-qt embed
+ # ${includedir} at build-time. Don't require those to be
+ # rebuilt unless SONAME changes. bug #695788
+ #
+ # We use /usr/.../${PN} (instead of former /usr/.../${P}).
+ #
+ # 2. have ${ABI}-specific location as ffi.h is target-dependent.
+ #
+ # We use /usr/$(get_libdir)/... to have ABI identifier.
+ econf \
+ --includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \
+ --disable-multi-os-directory \
+ $(use_enable static-libs static) \
+ $(use_enable pax_kernel pax_emutramp) \
+ $(use_enable debug)
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name "*.la" -delete || die
+ einstalldocs
+}
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 1d9019fc6bf6..9478afb1fd61 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -3,9 +3,11 @@ DIST libfmt-6.1.2.tar.gz 723160 BLAKE2B 36e7451a8732c62dcbf47e6d287ea582827b6196
DIST libfmt-6.2.0.tar.gz 733403 BLAKE2B c7ff69a56b90ec8df7d1af5c9934592449f2052046192aa498a6440d2aab76f10c17fa2833a41475b777dca2e3a1ae671021530bf0ef8be12443541f0f5212b3 SHA512 0003543f437bae416600a2b982eb133f65588bd36d7506fa7d883ae3133fcaf7ad825904af9b588ea22e5d91e56560aaf4243a6afa11ff6d8aace2e4bb1b0cee
DIST libfmt-6.2.1.tar.gz 733646 BLAKE2B 74394efc67065bf7a2259f5c16521b1cc4fb08bd599fe99be86b97b712c60d8790f39d65257ab18fe95bcde3d115d97e91c41d23309596f279cf51ebd4d2957d SHA512 520ef3addfecd9796253c347e0ecf4c18ef2f86d3b1b6b714f7834741f4737f1b7ed8365d3be46c9186617898911b23680cad2ae3cb7aadaf641ab32e327b0dc
DIST libfmt-7.0.0.tar.gz 738799 BLAKE2B de032e6d0400e960f9622281bd00aa8676c909f4f171ba327206d9fe7ce9616ea134f61d90616917e4a23d025d83c05ee41faa5a9b61691458a20e66631942a5 SHA512 c92bcc067cdc0d260179a1f731ab8f54d8c0f3af5911b39034f0e24b0a8ef43ecfd820e42f1a2e30c2a436113920ea06e73b297b185c8794a5d480f1ec9e5916
+DIST libfmt-7.0.1.tar.gz 739512 BLAKE2B e7a665c7f4017ca19ab555bb3183fdee47cbdfc9f757ddb2fbfac85cb105c2f73b3d6779b38ca5bf40db3b5b34ddee2a6d1099ef46334f81687559d59fcca085 SHA512 d3a2b1b374183d6fe042a3ac77c4bcf0a7804490432c889c647f5947c32ac80d0f21bbfd653e67a1cd42309a207fd7058a05dc9fd2540b6ff532049a27749a05
EBUILD libfmt-6.1.2.ebuild 779 BLAKE2B 2683bb7f04d4d9280df07b28d745afa01f734bc3fd8d1d52def8b37e1188dd54fe381dc846b877e5978374fad89c0db31d06bac1bac37b533b76403c085fd87f SHA512 abb2693b00595db88f3906bb782213b53b9655de994832eb4a189f89f301506113bf9743eb9b64fd7f835f0707866bc170a20ad52ddb8c08248799d5fe19e797
EBUILD libfmt-6.2.0-r1.ebuild 843 BLAKE2B bb2d750324db52df30d3f21c3141ae9d871527871d37a4ce26f7bf6364ad5152f59e100f4fc880ad588aa81cfd141378365a5537c619037f19b22a51317b7cba SHA512 d1cfbd8023705dc6e8456ea7c2412b3885ff0434803ceb1665477fff9b1c44d565bc4cc024036a9cf4be4801e5ab10db5b7fdfe182373e97f8b8b2847e58af44
EBUILD libfmt-6.2.1.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
EBUILD libfmt-7.0.0.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
+EBUILD libfmt-7.0.1.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
EBUILD libfmt-9999.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
diff --git a/dev-libs/libfmt/libfmt-7.0.1.ebuild b/dev-libs/libfmt/libfmt-7.0.1.ebuild
new file mode 100644
index 000000000000..376757b05ade
--- /dev/null
+++ b/dev-libs/libfmt/libfmt-7.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Small, safe and fast formatting library"
+HOMEPAGE="https://github.com/fmtlib/fmt"
+
+LICENSE="MIT"
+IUSE="test"
+SLOT="0/$(ver_cut 1)"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ S="${WORKDIR}/fmt-${PV}"
+fi
+
+DEPEND=""
+RDEPEND=""
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
+ -DFMT_LIB_DIR="$(get_libdir)"
+ -DFMT_TEST=$(usex test)
+ )
+ cmake_src_configure
+}
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 2b2fb8bcdff5..b39e52dcd072 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,5 +1,7 @@
AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8c4b6c621e4f8704c4841fd95d48773f0af850a456c6f80b80deed878be1334f08f8181f97dce64ed9e61f5cb1bae5 SHA512 971814ac34f17464a96fbc110fe995923d873981949a0126e50c206d39499d6146fd00414e837774e6932e4b491cc68c4147278d6216dda630fb876bc8f61791
AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02add413f633d96cc95513daa6e6b0e098fe803bb6a0e405a241fddc5ce0cfad61658d57c27bd724eecd32fd862af4c99 SHA512 b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89
+DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b
EBUILD libgcrypt-1.8.5.ebuild 2303 BLAKE2B 6a53021a185faa4382b2e2285fa5c2d11dd22fe58dc96997d57ecc488a147901fdf284980b817832ab74479213140f41403f0ba04f6de8a9091bfd15f502e0fd SHA512 d6a9b8a2fef2dcb37f7ce86247b2147fb3bd35d320c21e2973f73edff7c48fe7a742c6fdf54e4f884767dc5603c5fa470d7da44a6511257f2e1ed2b9327a5eed
+EBUILD libgcrypt-1.8.6.ebuild 2289 BLAKE2B 4baad70a8e36c2bae09832082f914061d290041ea956d9f07e6a17b17123f9c905b4885ad06bb76b3dca682fbcf64967e6acb1534a9a465d094e68e72dc1de6a SHA512 603f429b589a0d1a6eb113264fbe54b00f9b4721287938a3f6f420c9cc4ad4702c981fdd344c12be809f8126e2b5f454f130163d0c2afba11077b18f32287ad1
MISC metadata.xml 419 BLAKE2B 3f50eead2881e1336ad05c677b0108897d4664cbe228c95b5dfe3f7f0696581472692644e06d5d86b81b4bde0a3b41f0e65e25f4e40a29b830c1d9342b143a70 SHA512 c33fb355262594d13d6f7ea66e35a53379695fe10227d29d800f7fca8ee8cf2856a624ccf81ebe3352be10c4c010bc61131f95f9065eafcff0b5c70f684df4ba
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
new file mode 100644
index 000000000000..09976f1f81ba
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc o-flag-munging static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.1-uscore.patch
+ "${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ if [[ ${CHOST} == *86*-solaris* ]] ; then
+ # ASM code uses GNU ELF syntax, divide in particular, we need to
+ # allow this via ASFLAGS, since we don't have a flag-o-matic
+ # function for that, we'll have to abuse cflags for this
+ append-cflags -Wa,--divide
+ fi
+ local myeconfargs=(
+ CC_FOR_BUILD=$(tc-getBUILD_CC)
+ --enable-noexecstack
+ $(use_enable o-flag-munging O-flag-munging)
+ $(use_enable static-libs static)
+
+ # disabled due to various applications requiring privileges
+ # after libgcrypt drops them (bug #468616)
+ --without-capabilities
+
+ # http://trac.videolan.org/vlc/ticket/620
+ # causes bus-errors on sparc64-solaris
+ $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+ $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+
+ GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
+ $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+}
+
+multilib_src_compile() {
+ default
+ multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+ multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+ default
+ find "${D}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index c58dcdb5c131..55f2696b29b9 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -15,6 +15,6 @@ EBUILD libressl-2.9.2.ebuild 1742 BLAKE2B 3ba8f8b51b4b89515c6dadfb4b5975b1d683b0
EBUILD libressl-3.0.2.ebuild 1700 BLAKE2B 7e504f9f0cd914d6f6377df8a6ee579bc425645fcb86c679d94747aed2d0d35b88e1409fff4ca07f1bb3c002357e1bc6d591c2fa880ec71961987f9af8691990 SHA512 e562c9f2045fc553999e8afbf226c059ec99f96948559a6438f2d147ecf9452ec1c88bcd2303433e7a6c038301d96413ed916df6db03029717d6e50e65cf2bbe
EBUILD libressl-3.1.1.ebuild 1706 BLAKE2B 5ce07e1a9288f5f08df63198eec6b6e88b96c3648d3d4f6c98772a14f76d62e7add706d950386cf58f3c6439f5453ffa3dd4441efc3b4ff1c9b8fa7792c19aff SHA512 bd7e013012d0cab433ede6dcf10d3ae135b85bbaec33dae33a7ec1ca94e02493f4c31a667285b3160208be30ce92788515537efc690e98dc13332631a4c4a539
EBUILD libressl-3.1.2.ebuild 1703 BLAKE2B 11108f1b25dd38796ea7691f9050156d886e19dd3f456385cb254a4abb12f2a01cfa411032da454a6c731b6a91b8f6f5184e578c0bbdaffd84e82935892fd933 SHA512 3697c878f6cccf88b373311d1878b54ec1e6533db34fa20eeab8078b84960c0a7663a2bf5a4d2aadc2da288604d0c23a5a29edd71196404098276dc8f90e00f6
-EBUILD libressl-3.1.3.ebuild 1702 BLAKE2B 4a85f990640a51fdf6d85153547c812811f410349f9b2c9c294bf3d20457eea2ba72846ddf670f3260377ec364de248bc8081d8358d5feddafdff442b7879668 SHA512 86b5a4fccdfd3c0240c8e22b565ea07e36d62bea3b8f485938a6af2f8c85d543b3648e6a355e1b6cbef2a0965ec4ebcd5e5e5a6b60f2f6acc8a6a25492b80d39
+EBUILD libressl-3.1.3.ebuild 1700 BLAKE2B 9c1629864c12a3d6810632f277bbd78658219ac916996966fc9df257bd6431a9dee4bf90c76aeb84b0781501fcb680ec944f2968dd699425d11f8cc642fd67d7 SHA512 3b7864b664e0095d7f8bc693ad7d467513cab02ab3deabce64b2e25c4d8fa49ac252e1497260d45c940c7566b20f8533b04646f80a364798b48e2a24e9c74e5d
EBUILD libressl-3.2.0.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-3.1.3.ebuild b/dev-libs/libressl/libressl-3.1.3.ebuild
index abb7086fb0d5..80cc2bb68faf 100644
--- a/dev-libs/libressl/libressl-3.1.3.ebuild
+++ b/dev-libs/libressl/libressl-3.1.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
# we'll try to use the max of either. However, if either change between
# versions, we have to change the subslot to trigger rebuild of consumers.
SLOT="0/48"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asm static-libs test"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( static-libs )"
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index f9b0f98b750a..92c2e18eb655 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -2,4 +2,4 @@ DIST libzia-4.20.tar.gz 624009 BLAKE2B f0342c144c3e0b9dd7720466b24d79632de6dc859
DIST libzia-4.21.tar.gz 631871 BLAKE2B 8c54ae86e38569914c05da6c11b8ffe2c349884fb4e8ea00b05b88da12f6ee4e80ddac82f1790b67586c24d9df5b0ab71053fc80479cfdde22250a034db6dbef SHA512 e4277dfc3c004a0a1d1ccd8a11431e46344763ff5df68403b451e2be4b6bd00862fe2af0e15ce9017c3d6144d301e792f9279632687697e0dd4a238c805b04a8
EBUILD libzia-4.20.ebuild 719 BLAKE2B 3d6ccf2b62b7ff127dab3bffa2c5b0d52ba374f389998d7b60662874ca34ded6eaf6f58851a0a7ade1ec7d9e1cbd9e6fde4d95a0fd774845c92a3e9af74827f9 SHA512 d69a02f5bc0f92b8fdc50afad08c06a8d32999aed136edb99ca7bdd74fa15f1f242fb21e34cd48fc28bd40303740a2528dcfd5a22151b486eb069049c234d037
EBUILD libzia-4.21.ebuild 721 BLAKE2B 6f33ec501f2f24c9d27a0f2ee655c526bc4e758f4febec914f8f12809b687748bbb1238490e3fc3e0ab596d8a8ddd06010fb5e98c18e3ea7abc6a38e9442689a SHA512 6c4dfdfae0bf2dc34d8d237bf25767a22739ccc6350e25bf88a4ce82c48b96fcbd0b8b5d0f668d41319ba6d029fbf5c192db8a3c82a37a35249d120ada340ea3
-MISC metadata.xml 451 BLAKE2B 539464597b5fcacdf3701b1400a6ea8725e46164b768c129d98a0ca37e1edba4c90c619ff7138988cbcf0136201f723327d1fe561179181a30709e2977730255 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773
+MISC metadata.xml 325 BLAKE2B 749bbcd37b8ec3f3b537e5cca5abba07f042c3f0f56e07786633d5a68eec8242e5f9269c1cdc2b6d2862766cbb9c0bf5ebf971a7a35537c368fb033a52c1be12 SHA512 a406f9e74ba2f99af089909a9a0aef44da9ae1261a61d76cc4689e3d80e610f8610fe54ec3da3441e53c9e1f8c18487eb5662bbbc488a50b48844814cd235f2c
diff --git a/dev-libs/libzia/metadata.xml b/dev-libs/libzia/metadata.xml
index b845e64532d2..ad26392d055c 100644
--- a/dev-libs/libzia/metadata.xml
+++ b/dev-libs/libzia/metadata.xml
@@ -8,8 +8,4 @@
-
- libzia contains the platform abstraction layer for
- the media-radio/tucnak package
-
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 58e1e3d77e30..da7cf57064c6 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -4,5 +4,5 @@ DIST nettle-3.5.1.tar.gz 1989593 BLAKE2B 40e527a4cc541674acc39072f2ebbab4b6ed1b0
DIST nettle-3.6.tar.gz 2288173 BLAKE2B 45e08832e9c337f10d958956545c77f521b747b8abca56ce40c755adf352bdc2a79584b1e1c0e50f5ede0ac54794aabd6883601c53593b965aada744502789db SHA512 2471af875e51327af61af8bda53cd9c3adc27b6e32592a4b5b10b3ec60999ebf771ab9c54c747b0bade4b3b5a717e77fdbdb53699dd9e8a9ed4eee07f46aed51
EBUILD nettle-3.4.1.ebuild 1790 BLAKE2B 556d39f46ddc010db277004599bc6ac59ee28192b05eb5cc46ca0c1d12349f9255a2548705000e6728a9c9739556665a52800ad5e8f2424c538f28124c0286ff SHA512 b3152d8e5f2569afad23587361ae302846d357f02956b9222642b1f9ae3267b52d6ef0ecf43ae53c0269c0c1cb677d9daf04127be88805417eb9d77eda230bc6
EBUILD nettle-3.5.1-r1.ebuild 1751 BLAKE2B a6bb47e9a8df3e48403a94e801491b833072bdacbcb6ae84ee806854ea947424452ea16dfebabc5023a7ab7ab72678b8c704f4a003e0bcd420109dc2853cc7ba SHA512 b2f8977f00c4bfa283336978c3376b9fd30b2b19524f97d279ef2109bfdd2354610f6c7872f6c85a366cb198b9b05df66b345d5f8bf10399ac8f6d74a4b0e07a
-EBUILD nettle-3.6-r2.ebuild 1810 BLAKE2B 973c0eaeb764caf38bbc47d84cd091409ad9693e504376389543e00211415ca316490c5253f2057e203e351a907604ead10af3f92bfa04234391e16663dc272d SHA512 77cbd1018c17771f7324fd584e73d9be0cb4113b0647b51482fa4f36f18e7296b74fd5940e38d985fd6cc2dc42dbd5edbbe67399aa60d7f2623635397cf9e567
+EBUILD nettle-3.6-r2.ebuild 1804 BLAKE2B 57cb20e6bf266faf4a3bdbb1dfc9526737fa866f86c54b95a9d35d16b1f3871173e6e3bda3b27cf53bd4253cb66d8fe413e16e2c790f8e844107b12b24d8868e SHA512 eb4cedbd9bd966100beb1fd0c8757729c8f7f14aa50b9b739b947630f4a0e86313e1553da639149d572c11b200d053d586bca83f4a213d68a3b53a87b744a5cc
MISC metadata.xml 460 BLAKE2B 66da3978fdcd6fb67c2d345578e78768795254f4bb9a8b1ea8236ce99a0516cb2206f77280b5bfc23b98acbbee92bd96c32be12776fd83faa1a670fd10b3f648 SHA512 6a08cf01475e5b46f05ec3fd7d2186b7210501769d2d06780b5d078e1db39c23fd564a8a1c671362eb359c1a88759fb5479cbe757e832507aff81296fd739972
diff --git a/dev-libs/nettle/nettle-3.6-r2.ebuild b/dev-libs/nettle/nettle-3.6-r2.ebuild
index 6468f17add62..d813e7d1c276 100644
--- a/dev-libs/nettle/nettle-3.6-r2.ebuild
+++ b/dev-libs/nettle/nettle-3.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="|| ( LGPL-3 LGPL-2.1 )"
SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 411b93a643d0..1b86e6c805de 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -2,5 +2,5 @@ AUX newt-0.52.13-gold.patch 362 BLAKE2B 2f40cfe7e4b2b01b755c787d22d2006c2c55ca05
AUX newt-0.52.14-tcl.patch 3269 BLAKE2B dc542330cf49a43d63ca6e3edea141ae62664a701038c1086715b7de899f4b987c87069be8fd3a57f1f4c3fe8292d298876cf01f34e9d1f66f59ab7c08134d50 SHA512 6074f53b4070f4d8c7e1f4dfc4de7c549ac63a4af4bae70a3ebc3ebb03bd588923e8a952ffd93139041f5454318958a50a8ca8b0ecd98fb5d2ebde74b42aa313
AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b3ce01c502bd1a6898c6c56e5ecedfcc5672ab619f52d3ad3828569996d11302bdc24cc484f3d65a85d27b5e8c564e12311 SHA512 3583b352d2e46e12f03a1d3b0fcaab606018765b1ae8855a7160bced34b36235a4ed0cd2b4cda1202e40680d6d8a7ad7a93aec0b46d2ee17a091509cf079c9b4
DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
-EBUILD newt-0.52.21-r1.ebuild 2245 BLAKE2B 9a0d5fb29521c38714710175ad18a4c5de5b1b0a1988d255d809497dfdb272489b876420a1622b45299e8e7c452c5c12cb2b67a40813590ad53a349d6cf9a5db SHA512 e647f52683d7df3ca43e8ba31dd5de4add226f9ada32fc7e257a2bf17c71fb08acd035d97a2ce3d6cf7d530f08e5d1946eb40bcb641f90494c9a2c443ed57aae
+EBUILD newt-0.52.21-r1.ebuild 2258 BLAKE2B 1ce1f0487b95b79d5cd10d6d59122e1c9a7b6610016eb1b671f751de56f6f1827d6c7b9e650394a1b939e84cd06e1e71df803ba8057a4e33426a138de092374c SHA512 0e983781b1d73e15c83a9f47de10b46e05e00d8b2be23f676b230b6f771eb0069c52288d7d1d7db4f169ca97ed60d0bfa851f7348c30bfc756a1d3fe06a6ae6d
MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/newt-0.52.21-r1.ebuild b/dev-libs/newt/newt-0.52.21-r1.ebuild
index 0e660b1c0512..9a198423fc11 100644
--- a/dev-libs/newt/newt-0.52.21-r1.ebuild
+++ b/dev-libs/newt/newt-0.52.21-r1.ebuild
@@ -85,9 +85,9 @@ src_compile() {
src_install() {
installit() {
- python_export PYTHON_SITEDIR
emake \
DESTDIR="${D}" \
+ PYTHON_SITEDIR="$(python_get_sitedir)" \
PYTHONVERS="${EPYTHON}" \
install
python_optimize
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index cde1f03447a4..69f44a6105c9 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -2,9 +2,11 @@ DIST roct-thunk-interface-3.0.0.tar.gz 2685769 BLAKE2B d8ecf26113357a2a400bc1f2d
DIST roct-thunk-interface-3.1.0.tar.gz 2688973 BLAKE2B b372e12ba5795a0f1e85f7c904059fbe71e147051f287939aacb165c6ca3068e59694c891e3ebdec945e494df4134ca6e4595e7b00893479387d2326b9af5b13 SHA512 dd63d097a42c8751846a1c5649a9c35c0d5e5dc68b1e8080cb6e333f787851ebc649c36d952aefbefbf9558c914d55c612800e85620b24676d7d2d7454bb3490
DIST roct-thunk-interface-3.3.0.tar.gz 2689906 BLAKE2B 0eee8be65b0be8136dc0091cbc5534b89d630b9ffc1af1d6bdbf98671e141f524b3789153da673ed27dc3810d73e6ea8afb2fed776aa8df83e3c613b3776f81c SHA512 6ee02e5a9ef04ff9f873f762a78dcab93e45a98793545a882839fc2c890ea13030038130b1de266422eea58681e9fffa119e54b8d2f980c3a09c92b692d5cf3e
DIST roct-thunk-interface-3.5.0.tar.gz 2694261 BLAKE2B 57beccb18bfcea9f99704e21610d62e922feee772d912a8e3e4b0618e309a0fd0983bc62f7476511d1c94dc1f7fbb95d2a7da8205ba735833bcc0846dca13e3a SHA512 aeeb066924d0b20aadf1e2ea6f752d4de1e579fcf245b8866d2856a8d0ca12c907234d97e986512c7c6fa58460937aa5fb574485fbc7975baae4c2fcef519d6c
+DIST roct-thunk-interface-3.6.0.tar.gz 2692784 BLAKE2B 13b5834b733037828a532485a4e5a44e31eee17d42ebdcadec1a67b4d157a7a7ee3e92e8f0f03c6a5f17dba55931fd7734d7021d204ba7567d322ff023d05fcf SHA512 f4578833a17b0a4e6be504403dbdc69cdb8702f5255ac018463026f79df9df56c602abe362c39e566df22cd73ef12c1ff648ff16ce3830d0ec03283a978ca318
EBUILD roct-thunk-interface-3.0.0.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224
EBUILD roct-thunk-interface-3.1.0.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224
EBUILD roct-thunk-interface-3.3.0.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224
EBUILD roct-thunk-interface-3.5.0.ebuild 1097 BLAKE2B 7b5d1733e8464d3a242e59e517edbe17da86de3ea5815f4b8403b462ee999d6c42b7f37adf2eb7f5173d62f9f087659b39c2bdb0dc6728f770bd84138bf176e3 SHA512 5f7922ae5a9d86faaf621a8efa74108b33fffe5a73bc9b169ecc2016c2b5a948f583ddcfcf008c44e3ed1bff040dda395089ba1e68a87d27c14967b145fd8a4a
+EBUILD roct-thunk-interface-3.6.0.ebuild 1097 BLAKE2B 7b5d1733e8464d3a242e59e517edbe17da86de3ea5815f4b8403b462ee999d6c42b7f37adf2eb7f5173d62f9f087659b39c2bdb0dc6728f770bd84138bf176e3 SHA512 5f7922ae5a9d86faaf621a8efa74108b33fffe5a73bc9b169ecc2016c2b5a948f583ddcfcf008c44e3ed1bff040dda395089ba1e68a87d27c14967b145fd8a4a
EBUILD roct-thunk-interface-9999.ebuild 1097 BLAKE2B 7b5d1733e8464d3a242e59e517edbe17da86de3ea5815f4b8403b462ee999d6c42b7f37adf2eb7f5173d62f9f087659b39c2bdb0dc6728f770bd84138bf176e3 SHA512 5f7922ae5a9d86faaf621a8efa74108b33fffe5a73bc9b169ecc2016c2b5a948f583ddcfcf008c44e3ed1bff040dda395089ba1e68a87d27c14967b145fd8a4a
MISC metadata.xml 742 BLAKE2B e4bf5b17c7add51f1fce354e5b68d874808e680e3dce8e514da738a0fdfb8a26076f76cfc5c8091bd11f7ef4576e2d45334590f20f899865b8c984406892b1a0 SHA512 7d0b104b201778561f5e0566c28f593abd8a9c05ea1154a7d58bebb135f15e86cf6dd7f98f9fd5059b054ffac1d64a86404743f7c9bb1a619431f5e911a233cf
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.6.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.6.0.ebuild
new file mode 100644
index 000000000000..973e79e665c8
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
+CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl
+ sys-apps/pciutils"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+ cmake_src_prepare
+}
+src_configure() {
+ local mycmakeargs=(
+ -DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
+ )
+ cmake_src_configure
+}
+src_compile() {
+ cmake_src_compile build-dev
+}
+src_install() {
+ cmake_src_install install-dev
+}
diff --git a/dev-libs/tomsfastmath/Manifest b/dev-libs/tomsfastmath/Manifest
index e49e7841eaf1..696df45785ca 100644
--- a/dev-libs/tomsfastmath/Manifest
+++ b/dev-libs/tomsfastmath/Manifest
@@ -1,4 +1,4 @@
AUX tomsfastmath-0.13.1-makefile-fix.patch 1703 BLAKE2B 2182f88b8569fac105eb179fdc7c10a7c9b7b17619a725c30d8374a2589f048e0ca0fe71ffb2431e058a264b104bc091deb800215a490399e722055b39adee0e SHA512 f5e5df821ecc7beb8684116294322dae8bf166bfbc7cf3d5262534e036f1d486854e58ad2c2da382b8f08aa6b9db71d91607289587c4247837bdfc3313ad5cff
DIST tfm-0.13.1.tar.xz 322684 BLAKE2B 393c0e0e018b199c9fc975ab3013466399ea337f520f4634649a9e61b2218b9a6b218d11212b535fc8bbd2bf40d8722fc413dc60756f1b8ff7c78da049765083 SHA512 84225fe81bbcd1df7e40ed0b8c8077d60612246a76f3149b672dfd1066eb0179262fa4f5a42ffd2034e60cb74cfd86e0b49139371971ebbb4f41a4ecebca2111
EBUILD tomsfastmath-0.13.1.ebuild 1649 BLAKE2B 740e06df89c6e2a7fa009158ed8f32f6c3f4769bb0a11f9d1239e7248c546e2e9865a7d7f1bb591f4e703d7f585f5237d2bb807f6170d1efa871b5a64178fe5a SHA512 e2004cc6fbd4ad3adaf1a19762169a6e8cceab083b0af07eb0d165351b4a31657f4ff1abc140cf2148f5e8e028d1a6c75c621f3f978a8acd45b81f590817a04b
-MISC metadata.xml 481 BLAKE2B a61b20b9947cf71dcc385a04643a32c161c3314a65210f3d18d0743611890a066b9f9e7ddebb02c9ba39e6c6e82058dd78c796903357c432813f4e4323c06038 SHA512 1235eb2954bd7b7ea6e0ce326e50003255a49f558c7e2c08f40f2f7db71532643f1abd3ef28aaf3fa0c2f3e32d57ae07af7f9d49338bbe35bf9d690a023c5655
+MISC metadata.xml 358 BLAKE2B 8dc827f40c0b51ca769622a56b5282b3265428fccc2330cb1732faa1ab03a6962057eccda6c0c0b58bfed3fa190e64c77fad4e6480cf65fe7ee251eb087422e8 SHA512 1473c76d0d4a743815de12895599cb3f9f97201f0eca1231af0f16600b5b795dcd8c4cba4847e3166004dc0b3319011bba2945dda510bd789d7b0ee066d96f88
diff --git a/dev-libs/tomsfastmath/metadata.xml b/dev-libs/tomsfastmath/metadata.xml
index dfaf4142e2c6..15dd85b520a9 100644
--- a/dev-libs/tomsfastmath/metadata.xml
+++ b/dev-libs/tomsfastmath/metadata.xml
@@ -2,13 +2,9 @@
- sam@cmpct.info
+ sam@gentoo.org
Sam James
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
mjo@gentoo.org
Michael Orlitzky
diff --git a/dev-libs/univalue/Manifest b/dev-libs/univalue/Manifest
index a81a9bd5b3b1..e1126bf16b10 100644
--- a/dev-libs/univalue/Manifest
+++ b/dev-libs/univalue/Manifest
@@ -5,6 +5,6 @@ DIST univalue-1.0.5.tgz 20114 BLAKE2B 21f1432bf62325547db7a1ce0c84d80f47b160dc19
EBUILD univalue-1.0.2.ebuild 600 BLAKE2B 2fceb5490a188a82f12d3144e7a2c708803de0882e814ad29f67d736133996e5ca64d6e8ef6b6d2b95a1e0293980f324d602435d745aa74495452ae3357289d6 SHA512 feff1fa04de126a4e9217846c9ed115a8647dfeff365f52cf8309cb6e6c0d9ad3e728146c8232b8661ccdda786b304c3b15554f6a8469dcd55a80a888961f128
EBUILD univalue-1.0.3.ebuild 611 BLAKE2B 5b04edd36949349c453c46ee2305307e131db0e0c99e112965c186da6ddf3fc92c6fbb66572eacf2cec431afeb2ff967b3802e4cf48fa5f857506e7aed8429e9 SHA512 df499ad6fe120c9facaa1c7b3493e923a8c9bbb683a3e4846093ebbf9c7f702c571b3bb0755a9604caf03fa70c016362ed4b871b556973e4f7873beb418359d3
EBUILD univalue-1.0.4.ebuild 724 BLAKE2B fbfb620290be3fa105633bad5c9d2855b9a6fc4eda41487bb9ad22b7ddc2e88aa49bae8ded734a4b46138ea27dfcdbf0013d8310469dd61a2fdfa71225f54287 SHA512 8365ca1146a8d8a7e0f6eaddb8e4450f394569d44af1a3cc9d56226d520508bff8d089ce94a4c46ea9997bc55efb9cfc4a95797bcd559c3a187297a0745ee272
-EBUILD univalue-1.0.5.ebuild 579 BLAKE2B 9afbba833ffbbd36a60630d9c8d8a0e66f0ddd9302bfe5250bf52d08219e926ebca42e3d8fbe59d9d75b953939e29af1db32dbf000a4eb790da8ebd8706a0c90 SHA512 64ce87a1a28e6043cc552a87d2d9a33bff9a264edb06cfe9f28d8cb64d22a6b9eef5a247b1726f7761d6300e9bf45225dd5973f949cae79aadc615667b97c565
+EBUILD univalue-1.0.5.ebuild 577 BLAKE2B 108b64a02ac47dffe607c9f77e1504a82194ba4cb90033435481efb489f3a8bd30f926705b8a27b852090327be84ddb984ad8eca220bf683336c8c4d234528f7 SHA512 698f3db6f43fdc55d8cd175628b2f18eb28be622bfede53a4ba9f1a17db06b288748b206f22dc9181e513304a240f51dd781db80ae98a6865f2369e6476381c9
EBUILD univalue-9999.ebuild 720 BLAKE2B 625f17f804ae73f4698e5d46c0b20e213a66097e781abd5043ee634895d785dc6a961ce5119a12dfc298eaf55ea124627e5a5dfebc8cecf2ae9a6b83fa90ec97 SHA512 6f0170b7368a12f6ac1acb83c53626d9c151c7d81ec2460d21c5f060803c28c63b93be9a38a94bab03ecf82d194decd566905ea1402a2240c4d06f55fd951d13
MISC metadata.xml 471 BLAKE2B df69918c0c8a76f7801782856f7f95fd5108153da22239012d4f333be6e099c70ddd560055eb8a1d806a72d9e37465816171e60771c1c94c3c67f0e1a55238dc SHA512 d64632af71d51e5aa814bd58fa773fbc877abe1e59774e18fefcfab2949f08d8cf4e0482fe5acefb2dea3e0873e7d269d950c09ae4b65cb474bdd8a3407b2e39
diff --git a/dev-libs/univalue/univalue-1.0.5.ebuild b/dev-libs/univalue/univalue-1.0.5.ebuild
index 5c07a1e07b00..5b2a74436791 100644
--- a/dev-libs/univalue/univalue-1.0.5.ebuild
+++ b/dev-libs/univalue/univalue-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
src_prepare() {
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index cfbb1fb79bdb..ede2ae2ef7dd 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -2,6 +2,6 @@ DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8
DIST xxhash-0.7.3.tar.gz 126405 BLAKE2B 1304251c36a839f5d1b935c0633016222d6b517932d05b84d10ae8a3ee3fccd6cfd31d8e3768f033ca8adcbf2bb9728ffd6c4ccd7a9878ef59d289b49a497656 SHA512 72949010a267f063768241b182464c386005b4078f56902fee2f7804bd01f6c27878a6a4ec2a266cd59162934a7e471264ac5757dba570a97a2b5dad7703c664
DIST xxhash-0.7.4.tar.gz 143886 BLAKE2B 94305d8de0fbfc713b8ff093289d1bc496a0a7ca49e79c85205d7f502f421951d5eec543f6768d335d94f2aaaf6143868594e3027e2ab73b7317656ce1c5d8f3 SHA512 9dbf8424b355d6551c18cff7ed7dbd26d4e5735b9a07fe54911b7438d6ffed3a3c2429ac09b616de630ea16cf32ff73529b6c3fad4af78ae0cb2b06155086aea
EBUILD xxhash-0.6.5.ebuild 847 BLAKE2B 4b206a9c96a4ea24487de943816c5667bd214fd0d857b6ae462d717b5d7543ab659168a61e1462c05b8d183a9277deaa9fa87c09857c07bae5a8c58e445323d9 SHA512 e8ad2fdc3669a693fd28fb3bfb0b5819bde5999e93daf34c8f0bf7eed0b375aec5f0224701d76fd4a7e0618e6c3e912f758d3beba9b702d71cd532100fe54d09
-EBUILD xxhash-0.7.3.ebuild 913 BLAKE2B d3d7b71354d45e254ffaa13fef50e8515bfdf9e1f9bba5540a5dd2322843a3feb16daaa23b16836dfde9572476c1365dd2e31ad1d2893641c9e829f2393208d9 SHA512 c8e6cf473af45971cf89686f83210820a90038ea39f1c501e66c89c34d47b92da35895c9cf2ba62b2bfaa77aeb5abf5648e0c8c6a55051a6bd6eaa110422f913
+EBUILD xxhash-0.7.3.ebuild 910 BLAKE2B eacc3f5119e9f7be14e61b2993cc99c9c88d795f3bf6d9d654efb9a21a2733799c6707c614d013f4feeabbb421979d671e6c1611f1f919dc4fc532ac54f025be SHA512 2ea40c4b3996399f3b96aada31d60ff9f57841087f9288e5d51b6fabe979e664fe99e687a9ee72281bfac8eee06171a47a284424287599906fe574b81ba5a917
EBUILD xxhash-0.7.4.ebuild 917 BLAKE2B 21a173f201fe946d152b2b9dc3b7f8cd0c8e1c73be3814919bc936ebed692ac37f106da8c4bcb245df9dbb6e603b1ae44bc86e12d37c4a0761c705709430714f SHA512 f0dd7cca98528af60bd36b5cad069f19321458fa694f99c266604fc787dea10a1f6a7fa4b549fc028ae553452559bafda88ce574dac48783537065bb4b47a8fc
MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.7.3.ebuild b/dev-libs/xxhash/xxhash-0.7.3.ebuild
index 4a2c47743143..cbd705bae2c6 100644
--- a/dev-libs/xxhash/xxhash-0.7.3.ebuild
+++ b/dev-libs/xxhash/xxhash-0.7.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD-2 GPL-2+"
# https://abi-laboratory.pro/tracker/timeline/xxhash
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
IUSE="static-libs"
S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 1dc5f1e19ba4..5d39306462af 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index d7eab90a1164..b94803760112 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,9 +1,6 @@
-AUX luasec-0.5.1-compdefine.patch 854 BLAKE2B 56099515a5d743a71c01e50f7e45d3d59b1a7eae842b64d40364e976473b682b035555e8df30ed7946ba1927d6b79555e15b886c49fe471f3facb248ec4e149f SHA512 b5b406ca48f505a840e99731eda9d2f8f5b6651f6ba196e47ee2a449b1e94bd390b6fc8eadce40e9ddefed52fc939bdfaac3a634db302f9e09e01672e3161d72
-DIST luasec-0.5.1.tar.gz 46820 BLAKE2B 3b3d33c59c6817a810bb4ab5968657e29d123d5496e9ba28f03636ce389b99fb1e7724d9f2531fc651c86c8252a08973e76ae65ee5ab551cfe4d450519982053 SHA512 c7c92c79d0ec3e12b69f88d810a19397eaf570957d1f13b9695ee435cb6f0f9c31f5bc20a7252aac93d18eed98a5d3fc8a181cd85845a704e469055f215609a8
-DIST luasec-0.6.tar.gz 51071 BLAKE2B d10761399e074eaa657abad2788936296a6fd33db64291663e385b21fc4a4a19ff96fe1a88db9805a3794406f08c597a03c048cfc8675949baf9eaa9368b8b7f SHA512 f7004a329153d0126a3ea27b4986e9d83fb8f2de9c5c2f0c96427c50cc42e1252c69fd8cc69e2e8d423745d2dbfdb5a781b609938f7f502c7aedeb99fd0778cd
DIST luasec-0.7.tar.gz 47965 BLAKE2B 5bd19cfb5c2529a6fbee221442730c87394f1bf3d5089dd83d18e91ef1a2b88cde19c59988e438eb37e50c02c40a8906ad11ce9b3247b03ea11ed6d9e890b7d6 SHA512 6adf5241aa5a0d92c9dd7fc7f7e426969475548f47979ccc28187471b3bad4132c215de6da1f471d21b05c6558d36309264512c9c4ac70a53d6f6e204cac1358
-EBUILD luasec-0.5.1.ebuild 1081 BLAKE2B efb926c4f933bbddd415e583601f9b7cd8b33a6fcf377003b9390f02e853a26b937a540b97eb26969fc79ac12b96aeb929104fa7e91d882028bcd4f4fac33f71 SHA512 38eaacb4cbaa94f5549e0e6990fcc8c596428d30f901eb36b1f96bdf010a894983ad572d942d3692f131766dfb19ad99ebca289c043ddc4c1dc211ba5065b367
-EBUILD luasec-0.6.ebuild 1027 BLAKE2B d9aa030c4b22570fc58f43b1a2ccdb8efbf11d02913fe957dcb9ab65efc75f8a5909aade97b4bee5c5d3844321a28903dac4f38368eb8825869ffe28201fc2af SHA512 e8fb6764d9d480048edd2ae1ad68aa730e99c6f7b3839fd7f2dd2577bf162b194fca1093f9432657acbf5535c706b60a78cdaaf66884d30b1ee32ef09828d827
-EBUILD luasec-0.7.ebuild 1093 BLAKE2B 0061f58416b32eae8efdbea93e43304750c2be4b83e28e14fd83c51d4808c90882cd3f215db8aef9b6f1e3d84a224d7b5bc2778d2ca978335cacb178b6801058 SHA512 ff88279b832cdcec821088d173f9fea0aac8d0e2a60498c7c5cf97a4eea1d45a302d61e111b59e4b2b813a9694dc9cbb5e75ae7092bbf5b65e833f853e8c476b
+DIST luasec-0.9.tar.gz 52163 BLAKE2B fa95ae63b36f138f923dc412f527ff527e4f7562ad177ca7f450ef889e75c204d1bfec3773523fb68865c3846a0edc583cbf903db5233ff080074147f33bfb30 SHA512 ea601016328232ca0ff12be72897eeedac88a78834a63e1c36d2828a3187039665a2c60597b5af1fa6917b6fe87cd292fbcdfabcd67bab968f587e038d52a933
+EBUILD luasec-0.7.ebuild 1110 BLAKE2B 8776d00d3c3b5e437b70f91a0785a655ec95e2981321ec4002b207da2a1e2581f27b93471d08f527a16e032424a824e613c82ffc57297f3f74a4578072977761 SHA512 3aa16b8fd2c58a95ef4e1744ca4b96ecabd5d82a34121e3dabe394548d7ee92ff0e17249cc3120c12ae093c9ebb68e8bbdb96901f9dafd0123c9a685702e43f4
+EBUILD luasec-0.9.ebuild 994 BLAKE2B 680eaffcf974bcd70d01133f95ef4df3d375effe55aef2b7756030624431c4e2c51a13ef81a5651b2430379eaddb7e6d4f05b12222807ca10a95964c538699d2 SHA512 9c8c944fabaf6053ddbe4ebe6bda040b95c4ee2093a18c344e397c642fcaa227f3eb3a5390187e3573fdeb054385be60c57af0b8dd43735e09768ee60efad7b2
EBUILD luasec-9999.ebuild 1096 BLAKE2B 9ae3ac525136b70a4e21a287ac5be40ecd89f03824adbb003d43d8f2d3d7c11daf8c2ae51e397ad86deb16ac3ad919b845d385ed1b178cec5723d07cbbfcf259 SHA512 404162d929093dc74d606c729823dddc357cd6388e0a004c5543389a03f92c74c05b284d61dca5309633ba7986591b50ce42326d5170095735f3e802c53ec43e
-MISC metadata.xml 251 BLAKE2B 4baa47418ca09e10932c552ccd758002d2c76a0b9c5cac2a13babb2794610d1a5aa3bbdc60e58495cd5b9722a4271be2900fc19b577463431e19a96daa52faa2 SHA512 fdc3a6e4d9b393d015bb3ebcbd5d5ca9cd1b417f5e5ad51495fb7576144d29f967a686d3625e34ec5e1a15db252640ab224ae9e69d9552c4ad2e8a7794e9b297
+MISC metadata.xml 471 BLAKE2B 678f1c3e123d5690a1f7c68ee5b4c0bba74f48762692e9fc27739bdfa79e609ca9c140cb2eed1548b8c9f08f29bd828f805b28ca8b99ec51f301c77e52e41113 SHA512 8b5bd42751700ef9893f73111e8014c116b4a6e07891346602c42485c7daf4de63388936c95182bc6d2a9506353a48354e1a1e56e7ef299643206ced57d506df
diff --git a/dev-lua/luasec/files/luasec-0.5.1-compdefine.patch b/dev-lua/luasec/files/luasec-0.5.1-compdefine.patch
deleted file mode 100644
index 951b6fb11dbf..000000000000
--- a/dev-lua/luasec/files/luasec-0.5.1-compdefine.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ru luasec-0.5.1/src/ssl.c luasec-0.5.1-fixed/src/ssl.c
---- luasec-0.5.1/src/ssl.c 2015-11-20 22:39:32.000000000 +0100
-+++ luasec-0.5.1-fixed/src/ssl.c 2016-03-02 15:48:09.439005988 +0100
-@@ -395,24 +395,30 @@
- }
- return 1;
- }
--
-+
- /**
- * Return the compression method used.
- */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
- const COMP_METHOD *comp;
-+#endif
- p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
- if (ssl->state != LSEC_STATE_CONNECTED) {
- lua_pushnil(L);
- lua_pushstring(L, "closed");
- return 2;
- }
-+#if !defined(OPENSSL_NO_COMP)
- comp = SSL_get_current_compression(ssl->ssl);
- if (comp)
- lua_pushstring(L, SSL_COMP_get_name(comp));
- else
- lua_pushnil(L);
-+#else
-+ lua_pushnil(L);
-+#endif
- return 1;
- }
-
-Only in luasec-0.5.1-fixed/src: ssl.c.orig
diff --git a/dev-lua/luasec/luasec-0.5.1.ebuild b/dev-lua/luasec/luasec-0.5.1.ebuild
deleted file mode 100644
index f8cdd3945dd0..000000000000
--- a/dev-lua/luasec/luasec-0.5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs eutils
-
-DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
-HOMEPAGE="https://github.com/brunoos/luasec http://www.inf.puc-rio.br/~brunoos/luasec/"
-SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="libressl"
-
-RDEPEND="
- >=dev-lang/lua-5.1:0[deprecated]
- dev-lua/luasocket
- !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
- sed -i -e "s#^LUAPATH.*#LUAPATH=$(pkg-config --variable INSTALL_LMOD lua)#"\
- -e "s#^LUACPATH.*#LUACPATH=$(pkg-config --variable INSTALL_CMOD lua)#" Makefile || die
- sed -i -e "s/-O2//" src/Makefile || die
- lua src/options.lua -g /usr/include/openssl/ssl.h > src/options.h || die
- epatch "${FILESDIR}/${PN}-0.5.1-compdefine.patch"
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- LD="$(tc-getCC)" \
- linux
-}
diff --git a/dev-lua/luasec/luasec-0.6.ebuild b/dev-lua/luasec/luasec-0.6.ebuild
deleted file mode 100644
index 40f367fc02d4..000000000000
--- a/dev-lua/luasec/luasec-0.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs eutils
-
-DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
-HOMEPAGE="https://github.com/brunoos/luasec http://www.inf.puc-rio.br/~brunoos/luasec/"
-SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="libressl"
-
-RDEPEND="
- >=dev-lang/lua-5.1:0[deprecated]
- dev-lua/luasocket
- !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
- sed -i -e "s/-O2//" src/Makefile || die
- lua src/options.lua -g /usr/include/openssl/ssl.h > src/options.h || die
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- LD="$(tc-getCC)" \
- linux
-}
-
-src_install() {
- emake \
- LUAPATH="${D}/$(pkg-config --variable INSTALL_LMOD lua)" \
- LUACPATH="${D}/$(pkg-config --variable INSTALL_CMOD lua)" \
- install
-}
diff --git a/dev-lua/luasec/luasec-0.7.ebuild b/dev-lua/luasec/luasec-0.7.ebuild
index d6ddcf8c569f..4dc8f5927ae9 100644
--- a/dev-lua/luasec/luasec-0.7.ebuild
+++ b/dev-lua/luasec/luasec-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -25,8 +25,8 @@ RDEPEND="
>=dev-lang/lua-5.1:0[deprecated]
dev-lua/luasocket
!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
src_prepare() {
default
@@ -36,8 +36,7 @@ src_prepare() {
src_compile() {
emake \
- CC="$(tc-getCC)" \
- LD="$(tc-getCC)" \
+ CC="$(tc-getCC)" LD="$(tc-getCC)" LIB_PATH="" \
linux
}
diff --git a/dev-lua/luasec/luasec-0.9.ebuild b/dev-lua/luasec/luasec-0.9.ebuild
new file mode 100644
index 000000000000..013a9b13d85e
--- /dev/null
+++ b/dev-lua/luasec/luasec-0.9.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
+HOMEPAGE="https://github.com/brunoos/luasec"
+SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="libressl"
+
+RDEPEND="
+ >=dev-lang/lua-5.1:0[deprecated]
+ dev-lua/luasocket
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+ sed -i -e "s/-O2//" src/Makefile || die
+ lua src/options.lua -g /usr/include/openssl/ssl.h > src/options.c || die
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" LD="$(tc-getCC)" LIB_PATH="" \
+ linux
+}
+
+src_install() {
+ emake \
+ LUAPATH="${D}/$(pkg-config --variable INSTALL_LMOD lua)" \
+ LUACPATH="${D}/$(pkg-config --variable INSTALL_CMOD lua)" \
+ install
+}
diff --git a/dev-lua/luasec/metadata.xml b/dev-lua/luasec/metadata.xml
index 46794a8d4e3f..e33b533b4b13 100644
--- a/dev-lua/luasec/metadata.xml
+++ b/dev-lua/luasec/metadata.xml
@@ -1,7 +1,14 @@
-
+
+ azamat.hackimov@gmail.com
+ Azamat H. Hackimov
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
brunoos/luasec
diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index 88358718b567..71c7e48f75f9 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,4 +1,5 @@
AUX proxy-fix.patch 1026 BLAKE2B 6dde53833c9b35e059a4c1e7052cb494b4e1ceb2dc496a2d090e80fc2a1bfd1a30d014bb4c9f04425665cc00faa29fd434077a13e54cb73af0699363602e3aab SHA512 8b1b440936eceea4352876b24099bd9250c28c78a104f3722a65690a756f831f025257d940f1d9189e8ac023ab4b226b16c901214de59306bac96353a5adfe12
DIST luasocket-3.0_rc1.tar.gz 328598 BLAKE2B 9cc382d909cfa018edec237ac901220cccb0cf0e3a775b9cd8083487ace42a94dfd280f9423097f677f37ee9f85afcfff844250cd49c0f813b7c50c3adc532c5 SHA512 f6efce259aaacaa11472911471f8a13b118fe009b8953a82c6aa18b9ec829cd1293180904e56935cb130d36d267e3f27c91db2d78e03f7488f3e100571ed0540
-EBUILD luasocket-3.0_rc1-r4.ebuild 1159 BLAKE2B e073fff21eb73b934529867a934f453b27005a581115f6447b93ad9c6be92bcf39ab9b884855afed4779258fd1743761daeacb8f04ea79ec87bccee32c297a4a SHA512 1ae21adfdfcfbf614fd8babe94151b5755ebaf053ff80730511f44a4c01cebb1ea5eb948d4ca64c80c6c67055c2249dbea5a80358b255b74a2296ea9bbc763fc
-MISC metadata.xml 257 BLAKE2B e834a8237ad7c56f7e94a41c634fd0bb34b3c6e21b04ecafb2394839ee3bec0b0d5ee3cdcb43f358894156aacbdc6566092e6f1a4034573b117cba3368214b97 SHA512 a14f4fdf4826065cc3c5bba386e790d97d31a4e5eb042d269bdc56c9d6122bd2d3322971a6ce7431e860538af861e675a57afd9fa100e63d6c35d36c68aacf7e
+EBUILD luasocket-3.0_rc1-r4.ebuild 1200 BLAKE2B 195a0adc1922c68d5ec34b9e918a5f95e7fda0144c2f6b67970523885e3c77375ee184421804de32b41930a7b5f7c5f70e22030362423e4f4dbcc27591239e98 SHA512 ddec5f0f99583101aa5a3524e783d3aec40522c8ab5552ff0b762e0908c19d47eaec8e7a84bee96053ab98a9b9d7d17926ff93bbb7632841545354e58fdce980
+EBUILD luasocket-3.0_rc1-r5.ebuild 1265 BLAKE2B 68bcbf03a2486b9b4ce05c7188028feead382af42345105508385e4ac5a820956e28eb29be40b89e6b37d03b9302cd4acb8a70725eace6b74198c888e7eedc11 SHA512 185d0282e060df6166fbee16a9b920987a6ee87e1d8bfb440cdfe4b5d64e3ef4108a5917342f2c84fea2b3a8255d208732f4f6616245be1321e7dc2ddcb668d1
+MISC metadata.xml 477 BLAKE2B 52f02912583a3e2ab7d848bbfa824053e739efd616e07f73ffa49e8224f2b96da7007ee3d6e4fcbc613d9fbf92749d36f9db6f06cf2602f5df7fd6b9336fb310 SHA512 ea7c6680247c77e364316be205f5845357d940c6efd38e8f9ce2575afd02012a544cd859903f25255893653c1ab9afd3403fb67a5e9dc5469fc7bbf4b94d7677
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
index 445630ad79d5..edede5c979ef 100644
--- a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
+++ b/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
@@ -6,7 +6,8 @@ EAPI=7
inherit multilib multilib-minimal flag-o-matic toolchain-funcs
DESCRIPTION="Networking support library for the Lua language"
-HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/"
+HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
+ https://github.com/diegonehab/luasocket"
SRC_URI="https://github.com/diegonehab/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
@@ -14,9 +15,9 @@ SLOT="0"
KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
IUSE="debug"
-RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
S=${WORKDIR}/${PN}-${PV/_/-}
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r5.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r5.ebuild
new file mode 100644
index 000000000000..5ed5cbf52040
--- /dev/null
+++ b/dev-lua/luasocket/luasocket-3.0_rc1-r5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib multilib-minimal flag-o-matic toolchain-funcs
+
+DESCRIPTION="Networking support library for the Lua language"
+HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
+ https://github.com/diegonehab/luasocket"
+SRC_URI="https://github.com/diegonehab/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-${PV/_/-}
+
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/proxy-fix.patch
+)
+
+src_prepare() {
+ default
+ multilib_copy_sources
+}
+
+multilib_src_compile() {
+ emake \
+ CC="$(tc-getCC) ${CFLAGS}" \
+ LD="$(tc-getCC) ${LDFLAGS}"\
+ $(usex debug DEBUG="DEBUG" "")
+}
+
+multilib_src_install() {
+ local luav=$($(tc-getPKG_CONFIG) --variable V lua)
+ emake \
+ DESTDIR="${D}" \
+ LUAPREFIX_linux=/usr \
+ LUAV=${luav} \
+ CDIR_linux=$(get_libdir)/lua/${luav} \
+ install-unix
+ insinto /usr/include/lua${luav}/luasocket
+ doins src/*.h
+}
+
+multilib_src_install_all() {
+ dodoc NEW README
+ docinto html
+ dodoc -r doc/.
+}
diff --git a/dev-lua/luasocket/metadata.xml b/dev-lua/luasocket/metadata.xml
index 409d430eb575..2af4fc2a4ace 100644
--- a/dev-lua/luasocket/metadata.xml
+++ b/dev-lua/luasocket/metadata.xml
@@ -1,7 +1,14 @@
-
+
+ azamat.hackimov@gmail.com
+ Azamat H. Hackimov
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
diegonehab/luasocket
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 37213f21e10b..ca649b43eaf0 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index e0757dd27c3b..4e9d9bb5ba26 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,11 +2,15 @@ DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c894
DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
+DIST llvmorg-10.0.1-rc3.tar.gz 120876192 BLAKE2B c48c7e00b37adaab411a34196b87eb630a997ce56bcc33350a698d6d8e24877844b037735ec44abf80ac4c0a4d5a8682745afce4c44cb806bbe9e2a74d875da1 SHA512 ccb6a5bff336924381def11cdfa9c676351461e293b6250b15c1c6cd7694b99beb3e2f3834e8321a28586da091492cbde689213eb4108c9dbe86724e1ee66949
+DIST llvmorg-10.0.1-rc4.tar.gz 120873659 BLAKE2B 2413fb8af98384e608fab83b91fa826ffe2a7cdeb052eb6a50f253f9fe46ee71c040f210bb2f395d73b0a2772854ccafe2ac2cf1cc7c8405bc988183fa732aea SHA512 8b3f0b794c98956238e5d3d195e3a9cb9c9a40f78e2ed72c767fbeac3e1dbae58cb8132db7d2c8caa891a4d0bf631e2a9afc67f3c37707e9e6b94e2f9aeb77b8
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
EBUILD llvm-ocaml-10.0.0.ebuild 3219 BLAKE2B 8d2ac0dc88b865f723c527315aaabb6bbd75773660b63197c833c72d7915495e494d73144f84a451dec3793d45a2f7f44dc22beb5c60f55dfd88a23bb04aede0 SHA512 fa83b587c1170564e25c040e2809daf6dc13d1718074d22a7093f08e7444d6378dbeb2f5ddc57f681f4a93b14c95275c87027c9e9191757b1fba4c9008464d38
EBUILD llvm-ocaml-10.0.1.9999.ebuild 2981 BLAKE2B 20e8be985a1a936e0eb43605f200d13e5d0c80d1622acce5289bb6e2558a62c3c68dbc9bc098d0d00546c582cec7d24290e945d73853fcd6183066488269b04b SHA512 d500a27f06f21979477307e42b971a9c098e784396e6964f1ae337c57d8ed2ebc464530c0b857b67b39cdb928e22d16dd46c1ee2a04e3f2d2d4a9da760fd6017
EBUILD llvm-ocaml-10.0.1_rc1.ebuild 2944 BLAKE2B 90f05263b560f7efd2fa7ee1faa072dc53815c06539fae050d16547ca4d806041e6f4e93762a8faf74cd26a10d66f7da5f96930b6c2dc14d0857a6f329e7857e SHA512 577a51d77a5bac32c2d2f66659ea718b89691f5a0535abde10836aaafae0dddc84d6c328c85af24267a2a908956370dca902eb148e161bfd272318f1054fc73d
EBUILD llvm-ocaml-10.0.1_rc2.ebuild 2944 BLAKE2B 90f05263b560f7efd2fa7ee1faa072dc53815c06539fae050d16547ca4d806041e6f4e93762a8faf74cd26a10d66f7da5f96930b6c2dc14d0857a6f329e7857e SHA512 577a51d77a5bac32c2d2f66659ea718b89691f5a0535abde10836aaafae0dddc84d6c328c85af24267a2a908956370dca902eb148e161bfd272318f1054fc73d
+EBUILD llvm-ocaml-10.0.1_rc3.ebuild 2944 BLAKE2B 90f05263b560f7efd2fa7ee1faa072dc53815c06539fae050d16547ca4d806041e6f4e93762a8faf74cd26a10d66f7da5f96930b6c2dc14d0857a6f329e7857e SHA512 577a51d77a5bac32c2d2f66659ea718b89691f5a0535abde10836aaafae0dddc84d6c328c85af24267a2a908956370dca902eb148e161bfd272318f1054fc73d
+EBUILD llvm-ocaml-10.0.1_rc4.ebuild 2944 BLAKE2B 90f05263b560f7efd2fa7ee1faa072dc53815c06539fae050d16547ca4d806041e6f4e93762a8faf74cd26a10d66f7da5f96930b6c2dc14d0857a6f329e7857e SHA512 577a51d77a5bac32c2d2f66659ea718b89691f5a0535abde10836aaafae0dddc84d6c328c85af24267a2a908956370dca902eb148e161bfd272318f1054fc73d
EBUILD llvm-ocaml-11.0.0.9999.ebuild 2981 BLAKE2B 57a3eb858bd42118df84f90463f18a99e71f9c5f5c50afbb5e33dc22b9b283aa96eadb71a4a39be0d5b0dba877b77279c1a4b272ee69dde718d73b0026bd6850 SHA512 2316cc30a99d5045a2de69267e962be0cfa7d708ae919252390318504c37e3900cfa14af4887aba462d17d317588283c8f1e4b9887844ab03fcf869d48ebd4d0
EBUILD llvm-ocaml-8.0.1.ebuild 3064 BLAKE2B 41792ef0b7764c4b7c297a05ee56d4e613cbfbcb2e2157e7b70c8ecbb71aea698079abca2324291f9e0b9565e36509e81ee313bd152bb0c15c74c6b69c5f4dd6 SHA512 042075a171609318603e93320a6080f6b75319b7a6490a85bced7138001d30a72b45a0bf348a0e7c5a80f56c8c7cf3e6f921ed5fea41b62ece3226d00dde49d3
EBUILD llvm-ocaml-9.0.1.ebuild 2922 BLAKE2B d7ae97c680d9f223a0fbaf2989ee60c4ae2baebf73664c9909485fea6c99f5c4c817ff522bee6175a741a5632687d1d0ea5b7b961587a258ca0737ac419390ac SHA512 dc30f078950d944a5c9d18d8804db82300845564afc05878cc7b157d37ad32259c528b358b9cd12684da3b9885b62e92cc6a32b46b8c4cbf48269839bd4cfa02
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc3.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc3.ebuild
new file mode 100644
index 000000000000..7cff2bc42841
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc3.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+ NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+ "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.00.0:0=
+ dev-ml/ocaml-ctypes:=
+ ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+ !sys-devel/llvm[ocaml(-)]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/perl
+ dev-ml/findlib
+ test? ( dev-ml/ounit )
+ ${PYTHON_DEPS}"
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=OFF
+ -DLLVM_BUILD_LLVM_DYLIB=ON
+ -DLLVM_LINK_LLVM_DYLIB=ON
+ -DLLVM_OCAML_OUT_OF_TREE=ON
+
+ # cheap hack: LLVM combines both anyway, and the only difference
+ # is that the former list is explicitly verified at cmake time
+ -DLLVM_TARGETS_TO_BUILD=""
+ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ # disable various irrelevant deps and settings
+ -DLLVM_ENABLE_FFI=OFF
+ -DLLVM_ENABLE_TERMINFO=OFF
+ -DHAVE_HISTEDIT_H=NO
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ # disable go bindings
+ -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+ # TODO: ocamldoc
+ )
+
+ use test && mycmakeargs+=(
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
+ )
+
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ # also: custom rules for OCaml do not work for CPPFLAGS
+ use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+ cmake_src_configure
+
+ local llvm_libdir=$(llvm-config --libdir)
+ # an ugly hack; TODO: figure out a way to pass -L to ocaml...
+ cd "${BUILD_DIR}/${libdir}" || die
+ ln -s "${llvm_libdir}"/*.so . || die
+
+ if use test; then
+ local llvm_bindir=$(llvm-config --bindir)
+ # Force using system-installed tools.
+ sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+ "${BUILD_DIR}"/test/lit.site.cfg.py || die
+ fi
+}
+
+src_compile() {
+ cmake_build ocaml_all
+}
+
+src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+ DESTDIR="${D}" \
+ cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+ dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc4.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc4.ebuild
new file mode 100644
index 000000000000..7cff2bc42841
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+ NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+ "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.00.0:0=
+ dev-ml/ocaml-ctypes:=
+ ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+ !sys-devel/llvm[ocaml(-)]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/perl
+ dev-ml/findlib
+ test? ( dev-ml/ounit )
+ ${PYTHON_DEPS}"
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=OFF
+ -DLLVM_BUILD_LLVM_DYLIB=ON
+ -DLLVM_LINK_LLVM_DYLIB=ON
+ -DLLVM_OCAML_OUT_OF_TREE=ON
+
+ # cheap hack: LLVM combines both anyway, and the only difference
+ # is that the former list is explicitly verified at cmake time
+ -DLLVM_TARGETS_TO_BUILD=""
+ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ # disable various irrelevant deps and settings
+ -DLLVM_ENABLE_FFI=OFF
+ -DLLVM_ENABLE_TERMINFO=OFF
+ -DHAVE_HISTEDIT_H=NO
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ # disable go bindings
+ -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+ # TODO: ocamldoc
+ )
+
+ use test && mycmakeargs+=(
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
+ )
+
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ # also: custom rules for OCaml do not work for CPPFLAGS
+ use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+ cmake_src_configure
+
+ local llvm_libdir=$(llvm-config --libdir)
+ # an ugly hack; TODO: figure out a way to pass -L to ocaml...
+ cd "${BUILD_DIR}/${libdir}" || die
+ ln -s "${llvm_libdir}"/*.so . || die
+
+ if use test; then
+ local llvm_bindir=$(llvm-config --bindir)
+ # Force using system-installed tools.
+ sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+ "${BUILD_DIR}"/test/lit.site.cfg.py || die
+ fi
+}
+
+src_compile() {
+ cmake_build ocaml_all
+}
+
+src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+ DESTDIR="${D}" \
+ cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+ dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild b/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
index bfc6f8766273..6e0f28c74093 100644
--- a/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
+++ b/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="additional B helpers to check COW status"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/B-COW/Manifest b/dev-perl/B-COW/Manifest
index b219feb5b71c..147814640878 100644
--- a/dev-perl/B-COW/Manifest
+++ b/dev-perl/B-COW/Manifest
@@ -1,4 +1,4 @@
DIST B-COW-0.004.tar.gz 18295 BLAKE2B 7fcba80755dd7ca425f4f4caf2a39c4b813036d9538cb93f05e4eeb9fb15042c3f185d795da78a9d89c75a969b6f9a181506dcc3d072c390c0bafb514c866544 SHA512 97beaac8056e4aaeafb535a8e69f103632eb3746fa815313f84612414081155ab640299c18b4cb7b9ff0f61263cc1b9ce25de3313bbefce318163902a4503292
-EBUILD B-COW-0.4.0-r1.ebuild 548 BLAKE2B f44c067f8370b2bf6664973ff6f2495ef462620a2a6579fcc77a594c1bb0f49240be37a314584ffcabc82e3f98ef5d03bc2787183faa5fa0a933dfeb44ec0bc7 SHA512 a00d82968e6a54de85c42f81d1ee395cbc801c18ba61c06d59ec7d4b8f8bebb5cbbde8b553c38f756722d84c5219ea7d56f113daae1fedb10da91b12a41fbafc
+EBUILD B-COW-0.4.0-r1.ebuild 555 BLAKE2B 32924aa3bc9c39910b249f11789a66f01700738c3344fe52a9dd0d44eb024ab31e45a466a4807af2197bccfdcf803be4d830a530b73d2634e568e1d5ec7b49b1 SHA512 d7c7d528085d1c9c30102081031f1593ddf795d964063d28a0b1e49a3fb5142bd7748e224c61b83143ce2ecb4667872774cb1fe74ab421593a37d340aa78f8c6
EBUILD B-COW-0.4.0.ebuild 433 BLAKE2B c069f6c484adb0466ada3862ef7f1bf37902fa486d2ab009957dced2305040d650a68602f98512ffe6a45dded8f1a3739460796ac4cf472d43d1e47488ff29c5 SHA512 72d5317ee8b6c6f511589dcb2d9a8bedc592e7a556c58e3cd25ee73720c8cf4525e20fa49529381abf24534a9c6f006077fe5fe3d0ddc3ea6f701ecca0cf00ac
MISC metadata.xml 382 BLAKE2B aed091ef4956c0df3803f55b4d1cdb8cf33451257df3aa802865e32ddd8d3522abb45d8ab72691fc8b31a8eb44ecde83d8bf23a0b3f058ae12289c7789157ba2 SHA512 1f0eac593d2dde59cf0ed1935cf07cd0bf0029e421a03fe1aaec840ad13dd69ae33d9cb9012347c455da84bd55b1af78c835fdf5a353fde273e1abd0ffb13ed1
diff --git a/dev-perl/Clone/Clone-0.450.0.ebuild b/dev-perl/Clone/Clone-0.450.0.ebuild
index fa1b2ce238a4..9baacf7b4922 100644
--- a/dev-perl/Clone/Clone-0.450.0.ebuild
+++ b/dev-perl/Clone/Clone-0.450.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Recursively copy Perl datatypes"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Clone/Manifest b/dev-perl/Clone/Manifest
index a7246cf16b15..60cb38586108 100644
--- a/dev-perl/Clone/Manifest
+++ b/dev-perl/Clone/Manifest
@@ -1,5 +1,5 @@
DIST Clone-0.39.tar.gz 13785 BLAKE2B d3a1434a922f602110156e1eceb51709d8c41a292e69e9822f508d99c8868e617f46e71b3c640f15fd994700cbc8187e3dabdd43d1dfc1a7d2f19c8608f40e4a SHA512 5e3feeff7646fb2ea075267962f7f7013186310974cdbb87f779ece0f56baf62e7dbb0afa94816e20675dc03bc5fbe271b9594e12ea441863b78860691822b6b
DIST Clone-0.45.tar.gz 16130 BLAKE2B 92c4dd90e26b14754a77452c9e185094cb4604aecd06261783dc3d805e75a3d8e0a93492002c1e771b0e562b06a942d987e6bf3f2cf9e2450d5749146b98cb1b SHA512 4d91580fb60876cca7670411748e42e6af0eaba8fac25d60e7a50685ae7b1e697e12c8a2835693e3e4abf3c13c060a2740344eb804ec26ed274b895f599340af
EBUILD Clone-0.390.0.ebuild 600 BLAKE2B f71e4146798a547fea3c42b7d289172371b07c02741f759bfa92a664f9a1fec9d0fc76eae49fd39ea2bc2e0ea6ac8bcfd46dfa4dcebbce7e70a55f401792781f SHA512 f1b3d59162cf8d0db8e1c0dbec572e4a364834e03299f01787fa02e120d35fb7f064c432bba173417605eea5255e9139c6c99b023d7c71c27e918f508b5b08cd
-EBUILD Clone-0.450.0.ebuild 515 BLAKE2B d010ff629315d6fb26724f530cc14e0a5e3611f7fd91083c3baf2a212557dea113dd687b4792d079e6eb5295d924d2c684da8b3835fd4ce55e095106d36fe02d SHA512 aaf61d84a8c90bae23f609024960d99a779bcc67abb9778ff38e9e0c1ab7c96189e0465a6a17273fb22a58e704a18d6ece0f1976e38503af8643278dec8a660e
+EBUILD Clone-0.450.0.ebuild 522 BLAKE2B af7fdda2a64da2275f5fdfcddc5b9cb6bfc9ba923172d4e30fcdcbe92f45b72d5ea5acb8678ffc9d87511fe35cb04863a4710ffde5ea1d944d53435e9ced8972 SHA512 55409902523d12ca708599f0d31125ef12b3bc68663f03fb14a62544e434123731f990efca2df005abd29beae63f0ea82e2baddb43afdc9082cad55fa876d106
MISC metadata.xml 381 BLAKE2B 5626d365cfa4134c5838d948102ade74dd9ea2625b20dd514c5b9156d8eb2dca021cd5a54cbfab4db4e2487527d8337cd85a538ffaa1d9693276275c8821873f SHA512 cdae589f0c32e71bff82bd75ce3953caea18dccba25b29661b396a740ac61d392b398399cab3a97e33c16d75750b2c2d1fc8a7e1c9599f9e64d53c042cf15fc5
diff --git a/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild b/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild
index 8721cc8a806b..aae757c78b81 100644
--- a/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild
+++ b/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Standard en/decode of ASN.1 structures"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Convert-ASN1/Manifest b/dev-perl/Convert-ASN1/Manifest
index 399a09285024..d59a8f426d12 100644
--- a/dev-perl/Convert-ASN1/Manifest
+++ b/dev-perl/Convert-ASN1/Manifest
@@ -1,6 +1,6 @@
AUX Convert-ASN1-0.270.0-CVE-2013-7488.patch 1362 BLAKE2B 670b391c12cfa89051440fae8e796248b1f70695b95f47ad0bf420034b8b669a757b380be94ec530e6e692440170fd1b804e3c75b38d82bd5bccc41ea6083ff2 SHA512 6b4da9b77f9b7f7b0cb096858848568ca0ca2e52e359b53bb860965051356e310cfd5b916bcc16e0ac0562f4383aa2b9dbace394ca6e690b5aa39f44c850b5ef
AUX Convert-ASN1-0.270.0-perl-526.patch 6189 BLAKE2B 93614ec863a4a90e195fb7e99e4e4a6b729fa1d154a85d9d9f72232ff9cdca50868d5ba320653853ae6da5d612533d57cb9470c56ad2e01e979613cf628509bb SHA512 a6805154a0b7da8af86c101521b74d88562e34f95890ab62221bd7d0d03a41a1dcc82b26eb79383d84274abbb9ed4c683f627e75434062b7cf0984b340f5192c
DIST Convert-ASN1-0.27.tar.gz 74081 BLAKE2B 14929ec5f25ac85465204fb8f584384c5c65e73cb3ee5bfd9510a9bb2580e7c1a86f485af99ab7cd83813914ae6e277020720d26af8d2bda54acdd06fff7e984 SHA512 253bc0c1b2919841497a95bcbd05825217a3013c7f789fd9f3d389808fb015daca91f5c149797574bf32d38e94efb7f1d8df62e9e4c13928ec3b978cc9fd6fe8
-EBUILD Convert-ASN1-0.270.0-r1.ebuild 674 BLAKE2B e3187652172d915ea80b7f1ae387bf956a7ccc2cc3fb1fc450208af5d7717a1394723ea703532368c2d19b456963e161847b898fde3131a844e66223aa9f81e3 SHA512 b6a6a90316641b763518fda0f5006a08891cf0bfe1ffee47ecebdf074a610e1e7340da085326693811b2c03d1e7e661919c72c84a573d84a9c85156c343566cd
+EBUILD Convert-ASN1-0.270.0-r1.ebuild 669 BLAKE2B 9f289385ae250be58e717b9ae8589e9df06200187b2b53966330127d66d65a14062da8802dd58aa90cd684e1c1c89a9f750f1c07eec0de5f560602a201151b09 SHA512 9d1c1b7a8313c9f8f2df09e5c3dd28c9173c50e90e4140b25f0329cb0a2c7a9253553785b720cb6a4e4fde351ac310c972f0d4dd74606bd58d8e3d7016f29a01
EBUILD Convert-ASN1-0.270.0.ebuild 654 BLAKE2B 91f2a2ee6944fd0a713bc60d0f46dadb51888fb0ffa3d5e259a800df0daf1844578771d4f04b1bb29462b9562f45fa3ffa465273d4b17e96a5dbb0c7b4869398 SHA512 0b84c807e0e3306a8e87b8803362b9eb466cb4997505766c8b7b99c8b65ad7fcb9c7420d950ea738d01ffda5451326c3d6bafc5d5c4dc99187b965a725479ae3
MISC metadata.xml 396 BLAKE2B 835109f7d055b2dad36326d3f8cff1c08596d68b70a2688a7800c5c7baaea3e3282d491e1b2a321aa2ea1d510a4f9cc69448ca3193317d08abff39717ca3c25d SHA512 8e9334d912a55b1da2071790da0a113a4f841babee48bcecbee7943c5a242548d7d4ae9cfbc8840bf29712444ea28090e784713929a0437c9086648c774357bf
diff --git a/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
index 7de4ffe25300..802ed574783e 100644
--- a/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Guess OpenSSL include path"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="libressl test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Crypt-OpenSSL-Guess/Manifest b/dev-perl/Crypt-OpenSSL-Guess/Manifest
index f6086001d9be..8a75d91e6067 100644
--- a/dev-perl/Crypt-OpenSSL-Guess/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Guess/Manifest
@@ -1,3 +1,3 @@
DIST Crypt-OpenSSL-Guess-0.11.tar.gz 11346 BLAKE2B f22d09e23e91c36c722dc9800391b67a1f912f8af6a13ec95c9074e65559585c77e72596a6dae17db28e11f8449813777423a60d9af0147819dfcb91ba489152 SHA512 cdae7f20a15d24842cf117bfba4f3bc0ec7d1066251e0480cbadd8f0aa28c9c9573905726fc1333ea9fbbb3769a67dbf28043de8487dcce27dab5d14a0848b09
-EBUILD Crypt-OpenSSL-Guess-0.110.0.ebuild 659 BLAKE2B 7de45faef802017f0a218c95e1ca57b3dde5ac3f56d76b8a8f5a22e6464094df92ea3dcf4a9a8963d585894abe82e7f3bcb5194d5773ce6475c2e38c86f023d9 SHA512 a364115c90f09ca959231ccac49ceb3b6ecc7f26ce8427343a9060e7c8093c319e40e5d411de8b8c5a60a403c1ff8d2b1732f315de811e439e7e0fac819b6d0e
+EBUILD Crypt-OpenSSL-Guess-0.110.0.ebuild 666 BLAKE2B 88f5035ef0d4fab8a7e9ca1c36a95fd978ac9a333dafb01f0669a92698b49b9af28f35fa2c096b5181a3915400917752c0e7451409d4de20786affcd13167db6 SHA512 fcce9e712f3899d1cf7e77d9e7522b841af2e79d40eaab396a4f35d4804121303017d2cc81c7d3aa83e306da422bcc2850b49d23108546f968736295587ff849
MISC metadata.xml 411 BLAKE2B 777372daa18fae2658976904b22a5e17c15e1ce863a3ca026a03131be84cd435a8fa582c162500ae76881c6605abc8a2737ce877448d62f46e5101c1a9776b6a SHA512 da55f9571c2cec8cd96e6fbf95f74cab2b89cca8c74d32bfd217680f60ea0454b60b6cd851b0f8f841ea07ca2e23cb83764f0e28340eea38119ba216a31113f0
diff --git a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
index 0435bc6c26db..6634468b6db5 100644
--- a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="RSA encoding and decoding using the OpenSSL libraries"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="libressl test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Crypt-OpenSSL-RSA/Manifest b/dev-perl/Crypt-OpenSSL-RSA/Manifest
index e17ef890ff92..cef4bd6fac9f 100644
--- a/dev-perl/Crypt-OpenSSL-RSA/Manifest
+++ b/dev-perl/Crypt-OpenSSL-RSA/Manifest
@@ -2,5 +2,5 @@ AUX Crypt-OpenSSL-RSA-0.280.0-openssl-1.1.0.patch 7018 BLAKE2B 58b6adac6c8d7fa6e
DIST Crypt-OpenSSL-RSA-0.28.tar.gz 20035 BLAKE2B 9b98a22e68f2c16a38c0aee6ee9a509cd6c6b1d20b1c6533856b7682aa074c24a2e12e87ebdaf3deb7011cbe257737335646b52be74537533d836cbf6fb6ce6d SHA512 4a20c3f814e80ea15304b2a189001172e72237d703a0f9281e7e46d593c521508abfac3a259701994ec867f160821bec37e4e8234d04b792168db19b065ce324
DIST Crypt-OpenSSL-RSA-0.31.tar.gz 25856 BLAKE2B 172d48cd6cc0f3df2c1c1684897d8ee376663cb366a1e28c13e4af603b2b985d542f83284112be5e4717a3a13a512926b4413b5a8f08f7ed613cd9929683cce9 SHA512 e00d25fc1d39253ea2d7d6ee478403d2b38bd9125602baf5815672fb9e81674ff58bbb47539e425526db1988ebc1a40837372cf42ffd466cb532efa2e450ccab
EBUILD Crypt-OpenSSL-RSA-0.280.0-r3.ebuild 718 BLAKE2B 422cf2673094d24207e2b0edd8ca70b9112fdd9b459f51e89a3789cb7b98fe3199284e4d86b00b8401bd2aaedd5be1c7f4494ab71357275c71e13e60877d1c25 SHA512 3370be2a7276825e31c1638a132e8926463cdfa0adaab4247a3d1bfa8a56684d01fec143c8b21752ea13c498f6c52fee762e677abd10ebf8c597668010c5d9e1
-EBUILD Crypt-OpenSSL-RSA-0.310.0.ebuild 907 BLAKE2B 02d4b5f38d7bc605675007671e200ff3bc311248739273cbf037772a5b31f32f50a18ee8eceec8e4891e7a398d88df947d371942a6f204aa38bc582c56d2dca7 SHA512 bb3c5753a53c4fb9565c34cccb5b3ccb11a1ec7bb8cb3dc3fc07663f2309e7d9b4d9177913a403a9c9a06b871ba6085747c5218e1da52b4da07540890afe1773
+EBUILD Crypt-OpenSSL-RSA-0.310.0.ebuild 914 BLAKE2B a91b9b4a4f1dc67f10b8d740171c33ed58f8752bd06336951c0a10f693ba84f748592f052af3794657b0b0d6b7224cf398e8effd3741d4f9d2c2ca2fdd5fa134 SHA512 61b064e537313002a942f3e0796b24955ac0d5ee57f9de5e3a4fa421608cf6499a8d367f5f83f27a89712635fd504199be9aa5b04e26f0ceedcdaeff434cb24f
MISC metadata.xml 407 BLAKE2B 0dfbb22c5bd94b1f49bf73aa69d6f6ac9272aa4631f93d890a10f8ce0f17df9c3760a79f82bbe4453b4ce7bb1c9dd4a05d838b11681aae42611b8bb9496d2ac1 SHA512 5cd69acf50b1ec86397e96b03d6aca318669f83b7a6276231572634622e889479330e741ac7a858a5c4fd633f40b5c4ca7cc0bc40e6cfc8eb02bee827eabb9a2
diff --git a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
index 1d084e340495..dae6dd23e4c9 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="OpenSSL/LibreSSL pseudo-random number generator access"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="libressl"
RDEPEND="
diff --git a/dev-perl/Crypt-OpenSSL-Random/Manifest b/dev-perl/Crypt-OpenSSL-Random/Manifest
index d4bb70d872ad..3036a7498eb8 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Random/Manifest
@@ -1,5 +1,5 @@
DIST Crypt-OpenSSL-Random-0.11.tar.gz 15161 BLAKE2B 33c491755f210514361f6d97715dee781a3f1b99879b2357002dc6dfc8e6c63df530cbcc1ceb8da407928aa531d0fbe85f43afab3d86995f0ade6c58f8bbd320 SHA512 c579cb2b586dbabd697a9c7c989a360ed4bd8e9b28d7c93ad99a86bd9bd680a89c3fa77f6315a1105fd41bfdfa18087ca4cd51fb320faad7a6be9b90e3e69b95
DIST Crypt-OpenSSL-Random-0.15.tar.gz 15506 BLAKE2B 4ed167082904f814fb5484e2c95c0ac881530afecf7ff170041261eebcf3f1227ba8cf98b375a0cf2b18376c7f849340f11ae673ff9638a4c5e4f38db995b9b5 SHA512 bba8ce86b97ce2d6271be503efff6e6e0ff60a797282a2b7cb9c6c0592b69cc43344f9738b4790e5fc165a7273ff01e35ada481cf8c4dfde38cb7ad741d97530
EBUILD Crypt-OpenSSL-Random-0.110.0.ebuild 767 BLAKE2B 378a31d832dcfe9871c510a584a61b24cc502770ccdb596c8822656cfcab71179190a74a4d9bd8c0a43dd9bd8b7ebb9ab4c246a51061573b9c5a272912657e70 SHA512 748227d1dbd91497673bff651eaf4719812259f679bd81d316e51f52d38ded23f36d42270877819a3edeaae8eb88a5d3ab4794ef9ad0e7ebb8bb07cf18c1c135
-EBUILD Crypt-OpenSSL-Random-0.150.0.ebuild 801 BLAKE2B d3438e61dcd4d63c945060f61e2b7e3f9ab6f5a664f8e4de855fdd2f755c77213502684777fe7dfdfb233a76063f07e2019f23d90b49384196c1d359452362ca SHA512 30cdbc5dc1b2b2eddc1251eda4d34a9b40a0c2ef22627fb0e0dd57bfedf53c7dfb8202c61ae3b6cf70cd59b97c95d02f918ccfc21802d591461d2b3c4a362bdd
+EBUILD Crypt-OpenSSL-Random-0.150.0.ebuild 808 BLAKE2B 5d90b641e265765fcc0b4c8983c8fb5657dbaa761c22e5c29da28c75843ef4b764cc6b3815fa03dfacb51a55461a8f903cc53ceccce2970446127300253da5b7 SHA512 e16a58ba9fc8a6b08fc5a1a59708f5c8ba8133c150fd61946dd42fac4b839b7c39be10130996819d28114bfd4e1e27d71fe4e73238fa19ad7542d812775221b1
MISC metadata.xml 413 BLAKE2B 03a4dca7d919259dff481a02856287747167ede1794ca2a3307f653ea32c5e34c0a65d32961620ddb1a549da94b1b6a32d7db3f19651a4ff9e93fac03d34b642 SHA512 db707a5e0349fcbf52586739288ea6b95c907918897c611837baab0b8792e58c4864cf785d719af8b8a096c8bc607d2198c5e627dd4cb5a322cbe42c5bfc5e58
diff --git a/dev-perl/DBD-MariaDB/DBD-MariaDB-1.210.0-r1.ebuild b/dev-perl/DBD-MariaDB/DBD-MariaDB-1.210.0-r1.ebuild
new file mode 100644
index 000000000000..3bc688d8707c
--- /dev/null
+++ b/dev-perl/DBD-MariaDB/DBD-MariaDB-1.210.0-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PALI
+DIST_VERSION=1.21
+inherit perl-module
+
+DESCRIPTION="MariaDB and MySQL driver for the Perl5 Database Interface (DBI)"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test +mariadb mysql minimal"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="^^ ( mysql mariadb )"
+
+RDEPEND="
+ >=dev-perl/DBI-1.608.0
+ virtual/perl-XSLoader
+ mysql? ( dev-db/mysql-connector-c:0= )
+ mariadb? ( dev-db/mariadb-connector-c:0= )
+"
+DEPEND="
+ mysql? ( dev-db/mysql-connector-c:0= )
+ mariadb? ( dev-db/mariadb-connector-c:0= )
+"
+# New test-harness needed for parallel testing to work
+DEPEND="${RDEPEND}
+ virtual/perl-Data-Dumper
+ >=dev-perl/Devel-CheckLib-1.120.0
+ virtual/perl-ExtUtils-MakeMaker
+ virtual/perl-File-Spec
+ virtual/perl-Getopt-Long
+ test? (
+ !minimal? (
+ >=dev-perl/Net-SSLeay-1.430.0
+ dev-perl/Proc-ProcessTable
+ virtual/perl-Storable
+ )
+ virtual/perl-Encode
+ virtual/perl-File-Temp
+ dev-perl/Test-Deep
+ >=virtual/perl-Test-Harness-3.310.0
+ >=virtual/perl-Test-Simple-0.900.0
+ virtual/perl-Time-HiRes
+ virtual/perl-bignum
+ )
+"
+PERL_RM_FILES=(
+ "t/pod.t"
+ "t/manifest.t"
+)
+
+src_configure() {
+ local impl
+ impl=$(usex mariadb mariadb mysql)
+ if use test; then
+ myconf="${myconf} --testdb=test \
+ --testhost=localhost \
+ --testuser=test \
+ --testpassword=test"
+ fi
+ myconf+=" --${impl}_config=${EROOT%/}/usr/bin/${impl}_config"
+ perl-module_src_configure
+}
+
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
+src_test() {
+ ewarn "Comprehensive testing requires additional manual steps. For details"
+ ewarn "see:"
+ ewarn " https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}#Testing"
+
+ einfo
+ einfo "If tests fail, you have to configure your MariaDB/MySQL instance"
+ einfo "to create and grant some privileges to the test user."
+ einfo "You can run the following commands at the MariaDB/MySQL prompt: "
+ einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';"
+ einfo "> CREATE DATABASE test;"
+ einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';"
+ einfo
+ sleep 5
+ # Don't be a hero and try to do EXTENDED_TESTING=1 unless you can figure
+ # out why 60leaks.t fails
+ perl-module_src_test
+}
diff --git a/dev-perl/DBD-MariaDB/Manifest b/dev-perl/DBD-MariaDB/Manifest
index 2bee8de07585..f1ef62dc4cd6 100644
--- a/dev-perl/DBD-MariaDB/Manifest
+++ b/dev-perl/DBD-MariaDB/Manifest
@@ -1,3 +1,4 @@
DIST DBD-MariaDB-1.21.tar.gz 179911 BLAKE2B dac1a868d64e792dc86ab46cea1fe2578ae691b9d6713cd83971c9ba0a3e2a0d8031c7be10dc66e4269c142aec1c54859e0e285faf9a29dc3cec7e3d8ad82a0e SHA512 0378b33e9cd31ced6f2331967c7ea63a233340bb4a60ef2bbece4843b3a62624875aa1a5e61a9fa1b709ecc8d67810c6fa4fb9ccc01df341e6d94325078f360a
+EBUILD DBD-MariaDB-1.210.0-r1.ebuild 2275 BLAKE2B 9dc8e91d04eafbc77eb7b8c66405f0460cc46064c1dec8fda932fd066a44335a37ba91aef5c42f07ee81de779922849110448165fb6bd85f52b2c5ccb8257488 SHA512 0820bb8a2473741b341c8a35c195559db14d2611e98f5547d15576676f95fb9fcd855bd6e33e0b4ca25c2815a389350d75b33b4db0ac7d874d6ffe7eb8b3840d
EBUILD DBD-MariaDB-1.210.0.ebuild 1919 BLAKE2B 53c1293d7bddcfab12c6c02e3bc408e2de4c3df4d5f337105ef91c7fd8adc94211d9d60f3214abe9fd87c11a974858018c276287550c4380128aae25053fe40b SHA512 f9ec0bbd2a0b39c211294379dbad1183565d973ff2d12596b6dee3fcfa89d9f4fdaa76e5254014a68faaa4d20a78f79d4acc0382f707a0859da3f4e8a09a1fff
MISC metadata.xml 599 BLAKE2B 9f789e171b5a1ac6a5f68ef97b53f33f65959aa3c63b0c1e323f0240444de03a624aab3994483aacb6d7586ef899db646f6d7c539e130ed82ed0d9f8c8922dd6 SHA512 bc1efd175c3fd3b5c4789ef3d51dd1dcf6249467bcbaf12cc37bde98218d45896d704b5bf30e780ac64d7708f79357dc81b1d4d4219a23530bd317995acdc23e
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.13.0.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.13.0.ebuild
new file mode 100644
index 000000000000..252be08d1029
--- /dev/null
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.13.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=TURNSTEP
+inherit perl-module
+
+DESCRIPTION="PostgreSQL database driver for the DBI module"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ virtual/perl-version
+ >=dev-perl/DBI-1.614.0
+ dev-db/postgresql:*
+"
+DEPEND="
+ dev-db/postgresql:*
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=virtual/perl-Test-Simple-0.880.0
+ virtual/perl-Time-HiRes
+ )
+"
+PERL_RM_FILES=(
+ "t/00_signature.t"
+)
+src_prepare() {
+ postgres_include="$(readlink -f "${EPREFIX}"/usr/include/postgresql)"
+ postgres_lib="${postgres_include//include/lib}"
+ # Fall-through case is the non-split postgresql
+ # The active cases instead get us the matching libdir for the includedir.
+ for i in lib lib64 ; do
+ if [ -d "${postgres_lib}/${i}" ]; then
+ postgres_lib="${postgres_lib}/${i}"
+ break
+ fi
+ done
+
+ # env variables for compilation:
+ export POSTGRES_INCLUDE="${postgres_include}"
+ export POSTGRES_LIB="${postgres_lib}"
+ perl-module_src_prepare
+}
+
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
+
+src_test() {
+ local MODULES=(
+ "Bundle::DBD::Pg v${PV}"
+ "DBD::Pg v${PV}"
+ )
+ local failed=()
+ for dep in "${MODULES[@]}"; do
+ ebegin "Compile testing ${dep}"
+ perl -Mblib="${S}" -M"${dep} ()" -e1 #||
+ #die "Could not load ${dep}"
+ eend $? || failed+=( "$dep" )
+ done
+ if [[ ${failed[@]} ]]; then
+ echo
+ eerror "One or more modules failed compile:";
+ for dep in "${failed[@]}"; do
+ eerror " ${dep}"
+ done
+ die "Failing due to module compilation errors";
+ fi
+
+ local LIVEDB_TESTS=(
+ "t/01connect.t"
+ "t/02attribs.t"
+ "t/03dbmethod.t"
+ "t/03smethod.t"
+ "t/04misc.t"
+ "t/06bytea.t"
+ "t/07copy.t"
+ "t/08async.t"
+ "t/09arrays.t"
+ "t/12placeholders.t"
+ "t/20savepoints.t"
+ "t/30unicode.t"
+ )
+ if [[ ! -v DBI_DSN ]]; then
+ ewarn "Functional database tests disabled due to lack of configuration."
+ ewarn "Please set the following environment variables values pertaining to a"
+ ewarn "pre-configured Postgres installation in order for tests to work:"
+ ewarn " DBI_DSN - A DBI-compatible connection string for a Postgres Database"
+ ewarn " ( eg: dbi:Pg:dbname=testdb )"
+ ewarn " DBI_USER - A Postgres Database Username"
+ ewarn " DBI_PASS - A Postgres Database Password"
+ ewarn ""
+ ewarn "For details, visit:"
+ ewarn " https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/DBD-Pg"
+ perl_rm_files "${LIVEDB_TESTS[@]}"
+ else
+ # Super user required
+ # https://rt.cpan.org/Ticket/Display.html?id=132965
+ perl_rm_files "t/03dbmethod.t" "t/04misc.t"
+ fi
+ # Parallel testing breaks database access
+ DBDPG_TEST_ALWAYS_ENV=1 DIST_TEST="do" perl-module_src_test
+
+}
diff --git a/dev-perl/DBD-Pg/Manifest b/dev-perl/DBD-Pg/Manifest
index 75b7f0cac291..0d55b8b87dea 100644
--- a/dev-perl/DBD-Pg/Manifest
+++ b/dev-perl/DBD-Pg/Manifest
@@ -1,8 +1,10 @@
DIST DBD-Pg-3.10.0.tar.gz 268414 BLAKE2B da6ac65519632aa95ee2554607d5e26820527042873ab78a9e40e671902b1b8e2fe39f37e44b15cf3db8eda243e57c7fab9077d4a08ec7f3c312825609fbc805 SHA512 46c985bbdeeed4ef60d6fe06034fa0959df288f2b9bbd434e2716676a3cb7a1ded168a3cf87a6a82eb397eb8edcc023c0b85483e948ce31abcac64a1919580ba
+DIST DBD-Pg-3.13.0.tar.gz 278332 BLAKE2B cf405cd2afd5095fb7bc824b9fc4ca3c9aa86c3bf0bfe0a651ea21ec48921e97d20b8a4fffc3847d1ebe4c737d29671564b48fafea2f71f7fa0128733f47d0a9 SHA512 70fcf250f143d974fcb96fe597464bd5c91453fe00b36521afbf13e98c60f38ece4e79fa7e0076b273c4e30d67748c0c3be0879ba569a278fb1b1f2124da8913
DIST DBD-Pg-3.5.3.tar.gz 256570 BLAKE2B f589fc4ed978d2215d66b4cfd72b00e166f15dbe2caf004fa52c09fc6fc9f9b81ed84bc04ec0c4d3fe15f4eabb5a8a3b24b08acabb66b993c3ce67576a4c1721 SHA512 7a564e5c86fa41719289f6e391f0cd39f01df7d088892fca11175c60fec8a3af884f9204ae834caac2024ff0d45dcc013e314ec0c09a07fe7ee76170ec3a634f
DIST DBD-Pg-3.6.2.tar.gz 258640 BLAKE2B 76e25905b0336eae4ead14c28cf8338412fec023ea0540fc80f5c8d02b1c46de1b42ee8be2230fb3276aa3c8fa2bda9a97ddbd41fc81617a557359907c02d600 SHA512 1f55bd463d90cd0d9933acde0a79462a57f11e7ed9519943cc2cb4487b4b69edd7d16ffa3d666c50aca797f9756ff4e6a0d67b58bc100f4920da36169d73b7b4
DIST DBD-Pg-3.7.0.tar.gz 260083 BLAKE2B 73ae253e8033dab58075f6dc3c639e5d21f2df09880f59cb00fcdc201c17db1573e4902c4bfd535916775c0ef61a020a70e8f542ce28e257a903d4aabb9f6730 SHA512 edd4d3448dac1b563899c5fd4a1bad6cb810afdbbbf57b558bbe6710aa3e58530a6cf0932e35c3316c7f4f59763764d75ce1049f13c8c13deeb2e8a7c60ff73e
EBUILD DBD-Pg-3.10.0.ebuild 2736 BLAKE2B 2fe57ad6c03eeed66520bac0fdf34c5a74216e69e9ad14c5bfed936bd31637d0e0960c6b603469567ed5102fb73580a2b326d7974b5aa55012e38959c7133ecf SHA512 958f0dd6b06007af181454b90d60ed32c60d3bfd946b62b45bdb73299674290e52f1f66a0b8328df42e641b49df959b7fddf70fc07fca171af29c2c7c3f5acbb
+EBUILD DBD-Pg-3.13.0.ebuild 2978 BLAKE2B d928e01980997ce0e840d97650a04190756fefac6d6eee52a1bb0297e2f8f76983849136d5308c964a83a2aa4698167c6068e6778684ab7d9bc69038aead8243 SHA512 ea700c33891541af488a79c3231d95db184c599543408f5d44644c33bb03cca20a4337c44e33b403d2ab0348fbd3aea600ea00e424a106a6df8de5140e4ea506
EBUILD DBD-Pg-3.5.3.ebuild 1129 BLAKE2B 56b0ce849cd5eb12d51b5bc5a37cc5d4bf1c7a23f246e2805ebef48ca8e639b47f900666e350d5bd68320bd95d4bd2b14f0a8719e8f8572f279d2796ebd18ab2 SHA512 622f427307d046160a7a8c5a7cafdfa00759dc7389fe2ef878c760f3b45a7e9f9dd6fb7beb5cc87c76836e2536aa7e42b68209d17a44c3a93ddad1b3034e5ce6
EBUILD DBD-Pg-3.6.2.ebuild 1136 BLAKE2B 3f02aff38a01ca215b31eeed8440b12cdeba06a75c86badfd3c07ca521d4eda80fa24753fd4efad0031548c4baf1a0444d941d5ff1be5e68f8601d639ffe9331 SHA512 8d2e86c83fe589e801236b054239033920ec13ce583c7ac491cceb695d60c2241eee1272c27e3da9ea11fd686c0b83708012aa92cefb4ca7bf5c6de074ddf845
EBUILD DBD-Pg-3.7.0.ebuild 2736 BLAKE2B 2b7d7f260773cc2db8dcd68d704c8d8c3f0c9aa391467d4f2cdc1c8187707645dda511f55cc02a4dc9b68d8de1f8b2de65e0cd17aa583a8ecd6c170caf492fcd SHA512 e5250ee0d258d093a7f1ca9ead905d06f7db153286f847ddf815da6c4e6bd44f8715ae0fc4ad49d0503c6ed1f85af200defb6b7617ed98ebc544e85fd810a960
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.640.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.640.0.ebuild
new file mode 100644
index 000000000000..c0067291509e
--- /dev/null
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.640.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ISHIGAKI
+DIST_VERSION=1.64
+inherit perl-module
+
+DESCRIPTION="Self Contained RDBMS in a DBI Driver"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="test system-sqlite"
+RESTRICT="!test? ( test )"
+
+# Please read https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/DBD-SQLite
+# when bumping versions re: system-sqlite interop
+SYSTEM_SQLITE_DEP="
+ >=dev-db/sqlite-3.29.0[extensions(+)]
+"
+RDEPEND="
+ system-sqlite? ( ${SYSTEM_SQLITE_DEP} )
+ >=dev-perl/DBI-1.570.0
+ !
+Date: Thu, 9 Jul 2020 12:44:07 +1200
+Subject: Disable using bundled SQLite
+
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 5c832af..5f308ab 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -129,7 +129,7 @@ SCOPE: {
+ # a system sqlite is also sophisticated enough to have a patching system
+ # that can change the if ( 0 ) to if ( 1 )
+ my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
+-if ( 0 ) {
++if ( 1 ) {
+ require File::Spec;
+ if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
+ $sqlite_base =~ /=(.*)/;
+--
+2.27.0
+
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild
new file mode 100644
index 000000000000..267364b75c27
--- /dev/null
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=DVEEDEN
+DIST_VERSION=4.050
+inherit perl-module
+
+DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE="mariadb +mysql test +ssl"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="^^ ( mysql mariadb )"
+
+DB_DEPENDS="
+ mysql? ( dev-db/mysql-connector-c:= )
+ mariadb? ( dev-db/mariadb-connector-c:=[ssl(+)?] )
+"
+RDEPEND="
+ >=dev-perl/DBI-1.609.0
+ >=dev-perl/Devel-CheckLib-1.109.0
+ ${DB_DEPENDS}
+"
+DEPEND="
+ ${DB_DEPENDS}
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ virtual/perl-Data-Dumper
+ test? (
+ dev-perl/Test-Deep
+ >=virtual/perl-Test-Simple-0.900.0
+ virtual/perl-Time-HiRes
+ )
+"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.050-no-dot-inc.patch"
+ "${FILESDIR}/${PN}-4.050-fix-float-type-conversion.patch"
+ "${FILESDIR}/${PN}-4.050-fix-for-MariaDB-10.3.13-with-zerofil.patch"
+)
+
+PERL_RM_FILES=(
+ t/pod.t
+ t/manifest.t
+)
+src_configure() {
+ local impl
+ impl=$(usex mariadb mariadb mysql)
+ if use test; then
+ myconf="${myconf} --testdb=test \
+ --testhost=localhost \
+ --testuser=test \
+ --testpassword=test"
+ fi
+ myconf="${myconf} --$(usex ssl ssl nossl) --mysql_config=${EPREFIX}/usr/bin/${impl}_config"
+ perl-module_src_configure
+}
+
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
+src_test() {
+ ewarn "Comprehensive testing requires additional manual steps. For details"
+ ewarn "see:"
+ ewarn " https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}#Testing"
+
+ einfo
+ einfo "If tests fail, you have to configure your MySQL instance to create"
+ einfo "and grant some privileges to the test user."
+ einfo "You can run the following commands at the MySQL prompt: "
+ einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';"
+ einfo "> CREATE DATABASE test;"
+ einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';"
+ einfo
+ sleep 5
+ # Don't be a hero and try to do EXTENDED_TESTING=1 unless you can figure
+ # out why 60leaks.t fails
+
+ # Parallel testing is broken as 2 tests create the same table
+ # and mysql isn't acid compliant and can't limit visibility of tables
+ # to a transaction...
+ DIST_TEST="do" perl-module_src_test
+}
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index 6600d447fdcf..6caeeeeaa358 100644
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -8,5 +8,6 @@ DIST DBD-mysql-4.044.tar.gz 155006 BLAKE2B 2934224010bb09aaff9a334b25038a4c7d1eb
DIST DBD-mysql-4.050.tar.gz 161579 BLAKE2B fb17e151db730fd6955d3e4424dd495a9fcf5f3f4e2b6b79d9fdc86bc42c3314b68771f1d3c393fd80ea14aeda626a5c5d21f5b921d487350ffd79802edab1f6 SHA512 910f5b4ba7a7890d50a79f37d04ec8971a4f62acd0fe30bf3ab634f66e3128f0cd6513e5c9da8c807a0f4477d0cc766682ea8dd0d8072d02821b78df51f37879
EBUILD DBD-mysql-4.44.0-r1.ebuild 1833 BLAKE2B df6bd938063675db1406b7111bedc65ae3780ed40476f318c9dcf232defc935ce42ede0cda7c5db87a192abc87393e3ebaa7f9bcfdf85155fbab3047cc6e2889 SHA512 b1de7bc3f489dcf246ef98e82d7bd5b9109dd544d8be15c3aed0737db03252e90beb7c9436ea50e581ea988c10c2e3abddc358ecb5f9eb1a12bfe033d997f15e
EBUILD DBD-mysql-4.44.0-r2.ebuild 1936 BLAKE2B 52195ed520d26898effd8763cbc0afc5e9ad043a63e1e7b430eaaf6053cead82d60f8b882210a27663dfd634fcc9492ffe25548c6f6a1266500a66c74fe745d9 SHA512 ebc5221d4eef9b58dc3fe6eab8cea559ac8d18be1df930f6e4cb3d845b0664ed41e8cf152f6199377a2ed983de2630d501c66471f924ce897e8ab17f977ae0a8
+EBUILD DBD-mysql-4.50.0-r1.ebuild 2317 BLAKE2B da73d471c6235ea21ad04160cee02a6ea5459ae42e9efbf9966e8979547f7696ff3ac6ef8a7258b2d852b9a4746bc0e485d0f576413955fa4326329d25a9c49e SHA512 e4fc4d7678a1e04e572ceac9b071a3f9e34637b73d3707e48f8a02c41f879c4b644ce93292cd41a646e9a6bcc16fc2568530e2011ba7446322754d3b6329ad14
EBUILD DBD-mysql-4.50.0.ebuild 2018 BLAKE2B e0f5ccfccc9ee9af5154cee060d73bd22a4f87eb988814b7ce65cbe775558dd25cd155f9cd1e3322e1487358eb28a45a3f877389ad811380ad3ed9bc26fccb6b SHA512 a3a9c71079854e5a516e53bffa2003daa6268622fed44c6d69db0ca0826bf04be94d56112923809e95665bde0b0f13803bbb8396da7ffa868f2dee967e679e91
MISC metadata.xml 995 BLAKE2B 6aa64b675959e1e02b7480a08f1ba8f875cb2f6ecca588512c46b2bc265ab61d996ad30eba6b487d0b9af14e77ca225a25b53be77dc7a9e7647746f656aa39bc SHA512 916a209009bf9d19b2844ca0aa01dc24cfb3d66a556905b5208e94d9137199e25dac0e56280ab6e012746e79d6808aba7ca9af2987ed78f875dfdf48b642aaf2
diff --git a/dev-perl/DBI-Shell/DBI-Shell-11.960.0.ebuild b/dev-perl/DBI-Shell/DBI-Shell-11.960.0.ebuild
new file mode 100644
index 000000000000..780b3b80be60
--- /dev/null
+++ b/dev-perl/DBI-Shell/DBI-Shell-11.960.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=DLAMBLEY
+DIST_VERSION=11.96
+inherit perl-module
+
+DESCRIPTION="Interactive command shell for the DBI"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ virtual/perl-Carp
+ dev-perl/DBI
+ virtual/perl-Data-Dumper
+ virtual/perl-Exporter
+ >=dev-perl/File-HomeDir-0.500.0
+ virtual/perl-File-Spec
+ dev-perl/IO-Interactive
+ dev-perl/IO-Tee
+ virtual/perl-Term-ReadLine
+ dev-perl/Text-CSV_XS
+ dev-perl/Text-Reform
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=virtual/perl-Getopt-Long-2.170.0
+ virtual/perl-Test-Simple
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-11.96-sprintf-warn.patch"
+)
diff --git a/dev-perl/DBI-Shell/Manifest b/dev-perl/DBI-Shell/Manifest
index 9f142de78173..95381b3fbdcb 100644
--- a/dev-perl/DBI-Shell/Manifest
+++ b/dev-perl/DBI-Shell/Manifest
@@ -2,6 +2,9 @@ AUX DBI-Shell-11.950.0-local-scalar.patch 690 BLAKE2B 9c335d431c36c290a8de8b2dae
AUX DBI-Shell-11.950.0-nochrdir.patch 684 BLAKE2B 5172afa840872076088ac9ce367ea5cc5aaf8c0169e9948e0645a58dceeabf8b79c7957155cd99d0670fc53d5314e0ca98ad80f2e65a386a9c765d6deb59937b SHA512 95092f59cec232be5e8bab7973cd99040e25eaf77212f1673cf67f93458417b4b11f596d113f0a53385608e920d0e007a580e62733b65e72ea3a28677fb4eed8
AUX DBI-Shell-11.950.0-perl526.patch 1291 BLAKE2B 34a23fa7e9bc4071a07ae227cfacc60fa6c332c9fd3e9d04c2888d8f8a8b501087b3c9cd11fbea268562e029d11e984ac47c09783eb2cc89f64e6f46f30bd251 SHA512 aa8bd8a9a149052da8aef526cf8b992bdfa5ca150028d68387de8a83cb1648da9a9e32f78fa136c66f32c3cd460bd0164b2cbcb3b60b6faa5d9b87c5784b789b
AUX DBI-Shell-11.950.0-sprintf-warn.patch 732 BLAKE2B 4866aa33b1cc810201ad88ffe3f04a120ebe31e08076ace85f81418f5c2720e97a70ca6b1140d3ca8f343ddbe313ffbf3989614a475aae43568d3e9a85976083 SHA512 2808715da12581e22fceb71057fa5080188af8e5a6b1c4375b0a050973477d66f2a91f1ff473d7f3b5da19f73d06e02bd5221aa908d7d2e948ca6ca1cb1d21a2
+AUX DBI-Shell-11.96-sprintf-warn.patch 732 BLAKE2B 54dcbab91aaee2ec6816bb603514ce00303e969a122577e6311fc7b0aeec037926df46b58df473966f6d46b332d5b2e53ac17e878fff1d99e4a3975f11a00659 SHA512 0f8477e64ce59c65d386392a864e55e238178adc95a128f53b6845759a6317d435ad983ac379740063b73ddddd963cd2caec61c50a5f1876592a920b59c74d29
DIST DBI-Shell-11.95.tar.gz 51147 BLAKE2B 299d553eccd1c295b4221997d2ee95ebb1f0b865691e78d9864ab6ad39190593e3286551f7484f8e5dd028e126c3e7a9d5c3e3e73fa52ab7cdaaea6318257365 SHA512 a19fa2573dc20cb6844a523653f588da1eca56b4e8138b789cd7aa5c50b255ee4b374eda9baae588b5bdcd42183c9384f1fb8234d11022e02cb7f81dc0bd6c84
+DIST DBI-Shell-11.96.tar.gz 55409 BLAKE2B b580694b18f0a6955eb5981bf6454b30c30e50d1583a0b524ce47e0296baa7a3256c17be30329c278e1241b67780cab22bac53c30368609ab06eb50449dfe554 SHA512 772ec181c0ad0b1805bae25758168c66154843e8e86c84a6cb7919ed1c5e487f6ca9d206f496f688e0ddf792814358436098190598f941056ddca53a9ec46ccf
EBUILD DBI-Shell-11.950.0-r2.ebuild 536 BLAKE2B c3a807838ce300c2c5ffab50b5c366cb2b7a03798bf7cea239ee88a43b92a526db58583d7b9e2db4bb2a9c971a74f0e89f94eb9f41196b15c65e19dad4b1cd96 SHA512 c89696be45dff3644be42c5e31817d0e823d837be5c71ceb20320b98bf05c1cd535a102446301d82211d74d1dc5b61db278402d1d6a54e0bfd1861b07a4c69db
-MISC metadata.xml 1496 BLAKE2B bc49edb7aea2d4326f8b0448b3c0c2c6a2bee66547f3a4381cf8e77d12bc2a41fddb5d71f16548e79a55d05c7ee4f3cd1ff2ba3dba10f75ad662138947c7db8a SHA512 5d74012cb442d406756cd2002bd6cfddabce8c60b713411fd62faed6af78304ea34b982079edea5738cca7372cf37bf6391b94f3095161b043adce8469c64932
+EBUILD DBI-Shell-11.960.0.ebuild 754 BLAKE2B 6b7c7cd3bf1e1d7c9d307c65e328cdc1344d4b59c8057723ff635afdefff5670d97dbf38d73ff105e22468cecb5add7ae584fdf5cb37933a0bbdd60b8d03dcc3 SHA512 3187fe2110c10092c4e2835d378dbffbdff7f175bab68d6dd664b31e984f1cd741a2fba27bd3b08afddfd7721b71fa8bbadddaa950bb14defeadf63aec7680de
+MISC metadata.xml 1566 BLAKE2B 352004488429827dfe8163710f775a349755fc3bf9c6765134843806ae2031de390b08d832ffbe79e79f799762f7af3c1bdbb7cea5969f7568c691bcad2b6b2f SHA512 934918cea42ddc00fe782b37176250008b04bf5741cd4072b5cbac572c6f508fc615b9a2fd6fb4f93bbeb87f62503aa0262abdfabe2b4ef16eaee402c96b7fbd
diff --git a/dev-perl/DBI-Shell/files/DBI-Shell-11.96-sprintf-warn.patch b/dev-perl/DBI-Shell/files/DBI-Shell-11.96-sprintf-warn.patch
new file mode 100644
index 000000000000..930b22026d45
--- /dev/null
+++ b/dev-perl/DBI-Shell/files/DBI-Shell-11.96-sprintf-warn.patch
@@ -0,0 +1,25 @@
+From e04b6dc11fa15b4ab6da3fb1e826def507d9f0b5 Mon Sep 17 00:00:00 2001
+From: Kent Fredric
+Date: Sun, 8 Oct 2017 13:30:36 +1300
+Subject: Silence warnings about reduntant sprintf args
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=123216
+---
+ lib/DBI/Format/SQLMinus.pm | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/DBI/Format/SQLMinus.pm b/lib/DBI/Format/SQLMinus.pm
+index ce1d096..c7948a8 100644
+--- a/lib/DBI/Format/SQLMinus.pm
++++ b/lib/DBI/Format/SQLMinus.pm
+@@ -151,6 +151,7 @@ sub header {
+
+ if ( exists $cf->{format} and defined $cf->{format} ) {
+ $format_names = $cf->{format};
++ no warnings 'redundant';
+ $width = length sprintf( $format_names, " " );
+ }
+
+--
+2.27.0
+
diff --git a/dev-perl/DBI-Shell/metadata.xml b/dev-perl/DBI-Shell/metadata.xml
index cde1179c96e0..1f9c3a4a9d78 100644
--- a/dev-perl/DBI-Shell/metadata.xml
+++ b/dev-perl/DBI-Shell/metadata.xml
@@ -6,7 +6,8 @@
Gentoo Perl Project
Provides dbish, a command line tool for interacting with
- any installed DBD module directly.
+ any installed DBD module directly, similar to a shell, or various
+ database's native shell-like client.
DBI-Shell
DBI::Format
diff --git a/dev-perl/DBI/DBI-1.643.0.ebuild b/dev-perl/DBI/DBI-1.643.0.ebuild
new file mode 100644
index 000000000000..51958a4867e0
--- /dev/null
+++ b/dev-perl/DBI/DBI-1.643.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=TIMB
+DIST_VERSION=1.643
+DIST_EXAMPLES=("ex/*")
+inherit perl-module
+
+DESCRIPTION="Database independent interface for Perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-perl/PlRPC-0.200.0
+ >=virtual/perl-Sys-Syslog-0.170.0
+ virtual/perl-File-Spec
+ !<=dev-perl/SQL-Statement-1.330.0
+"
+BDEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.480.0
+ test? (
+ >=virtual/perl-Test-Simple-0.900.0
+ )
+"
+PERL_RM_FILES=(
+ t/pod-coverage.t
+ t/pod.t
+)
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
+
+src_test() {
+ if [[ $(makeopts_jobs) -gt 70 ]]; then
+ einfo "Reducing jobs to 70. Bug: https://bugs.gentoo.org/675164"
+ MAKEOPTS="${MAKEOPTS} -j70";
+ fi
+ perl-module_src_test
+}
diff --git a/dev-perl/DBI/Manifest b/dev-perl/DBI/Manifest
index c462f5c7ab6d..5a1c6eada361 100644
--- a/dev-perl/DBI/Manifest
+++ b/dev-perl/DBI/Manifest
@@ -1,3 +1,5 @@
DIST DBI-1.637.tar.gz 596423 BLAKE2B fbd2100d302f5096d4c4f0808d753c0647504b6d56cae82050e02a3716969d9e5ed8c0a33c58fb860d60e65d164d58b1a81d55dc4e669d5276596b9e1480c7a4 SHA512 48002d77d40c40f0514d464a83f78255dc1a4c5ebb721fc18bcffa06d5f19ad7aec51084d5d8a032e37c6867b5f63176a9b11b5bdf08426f903b841139698240
+DIST DBI-1.643.tar.gz 612372 BLAKE2B 9a4b45bbf979d25e54f1ece056c3bb1d753a016e8da41b530788e69181027a9f974dd9c0d1939adceca3877c4b46d4113a2c234960b4d4bb9c12261301b920b8 SHA512 03812f3eb1e43c8290dadb8cb14bbced9ec6e237228ea2a2ba91f22e52143906a91a7e82945dab30b1d1b9fc925073721111adafd9a09fac070808ab88f908b8
EBUILD DBI-1.637.0.ebuild 981 BLAKE2B 5e0ec0c4c0d0ae891f8ef15b38aade635601761f0a6ccbd8d2b916369746fb1e6ba68f40c6cc348b8b1485846182d1d4136dffc89f60dded2ceca23a178863b6 SHA512 1e979bb7988f9c46ced71b832d58c7329cb0cca735ee9de55712165dd910d8f313208586e9df632dbc0eef20ee68b4241874edba9b0c8047b5d2f40280272cd2
-MISC metadata.xml 6189 BLAKE2B 757acfe005206196a3d5d601d04cd4ffbcd6de7eb35fbf14d3ec08e0adbb6526c51a0f0bd8ecbf3b5d7fcbddcfcf6d3fb3289b0d1ce3c5b346b20b080ed5ac1c SHA512 c6a65731db7bba5615e95729a66f72abfd37eeca78519023695adde39cd2e6ed6ed39cb68496144b0b9ac0919ae86cde1dd9431d82aed5ebcfd29736fd9397a8
+EBUILD DBI-1.643.0.ebuild 1069 BLAKE2B 5b8dbd942cfe71e9181fa73a5bec3858c11b3ce1ab29a2bbf3a5dd94ac205ce622b2e65f7da86ed705b554b1c59eec158c36d5e0c98c7e7c11e2b28e22ecc693 SHA512 e98c92f68a4f835032a54f7d15ee222e73963470abb7fd0f21630740f443063d6fe6904f921b10af5121289507491155122c093613f282df020ba69ca11ae391
+MISC metadata.xml 6616 BLAKE2B 189a6efd2564069169700bd6bec350f638162c5bafcfb55914a2c7b10085a77a05485e0b915c4e6fe9d40ddaa73b9fa042ef654cbdbf46c494a909255a896da5 SHA512 61980db6cd92b9440aea94099ab46e0c58c64fd3844ea2320179510284fdfbf26fc65880b11eb3f771186171a2f4bea049d911ca7c93499d9f4eb0a2ebe40745
diff --git a/dev-perl/DBI/metadata.xml b/dev-perl/DBI/metadata.xml
index 162537fa5d08..b670ec02cb80 100644
--- a/dev-perl/DBI/metadata.xml
+++ b/dev-perl/DBI/metadata.xml
@@ -40,6 +40,13 @@
DBD::Gofer::db
DBD::Gofer::dr
DBD::Gofer::st
+ DBD::Mem
+ DBD::Mem::DataSource
+ DBD::Mem::Statement
+ DBD::Mem::Table
+ DBD::Mem::db
+ DBD::Mem::dr
+ DBD::Mem::st
DBD::NullP
DBD::NullP::db
DBD::NullP::dr
diff --git a/dev-perl/DBICx-TestDatabase/DBICx-TestDatabase-0.50.0-r1.ebuild b/dev-perl/DBICx-TestDatabase/DBICx-TestDatabase-0.50.0-r1.ebuild
new file mode 100644
index 000000000000..4dc10048e15f
--- /dev/null
+++ b/dev-perl/DBICx-TestDatabase/DBICx-TestDatabase-0.50.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=JROCKWAY
+DIST_VERSION=0.05
+inherit perl-module
+
+DESCRIPTION="create a temporary database from a DBIx::Class::Schema"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ virtual/perl-File-Temp
+ >=dev-perl/DBD-SQLite-1.290.0
+ dev-perl/SQL-Translator
+"
+BDEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.360.0
+ test? (
+ dev-perl/DBIx-Class
+ >=virtual/perl-Test-Simple-1.1.10
+ )
+"
+PERL_RM_FILES=("MYMETA.json" "MYMETA.yml") # https://rt.cpan.org/Ticket/Display.html?id=108141
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.05-no-dot-inc.patch"
+)
diff --git a/dev-perl/DBICx-TestDatabase/Manifest b/dev-perl/DBICx-TestDatabase/Manifest
index a16904e6e37d..91cb2cbf31ae 100644
--- a/dev-perl/DBICx-TestDatabase/Manifest
+++ b/dev-perl/DBICx-TestDatabase/Manifest
@@ -1,3 +1,5 @@
+AUX DBICx-TestDatabase-0.05-no-dot-inc.patch 451 BLAKE2B 41e7c3be55d71904e4ff156b454f73afdef6cb122cfb8e17f7676e62eb1bed9b1038e3a6f7a144fb41adbfc2433362be3e8daf51f2886e6f6452ffe86e51c1f5 SHA512 12b6845232e8937107c619152706297cff25e3ee7993a1e42df313d2b15ffa752f237012bbd24e09508af4568d14d19951a691bf17ba4114801814700ba34541
DIST DBICx-TestDatabase-0.05.tar.gz 21574 BLAKE2B 53339bbd4a280e3436016655866580557fa2fde394c14ad02154e77967096b3553c47c27907d422e33e6a6ef592bb7538aba924690ba08b3634bd32141f879c3 SHA512 df17c75594998e4a17b284d5c20809019f31e5ab20dd354e2d7e159d1d76554e3c08bd1797277b9909efe8ecd10aa82b606b325e1759258521c7e3cd5995c2c1
+EBUILD DBICx-TestDatabase-0.50.0-r1.ebuild 693 BLAKE2B 46ae58312f0c91c87e40f3ad1d287102d0f013df6d725cc0a7225a315c1232d1cbd5eeb7a60510e79ad5097f07ae40a47e8d100eae0b2ab5d57434b0844d4af8 SHA512 8f14196c1b4c386d4ab1a98d45b6870693f1217abb9c034a9c1890182f91315f459bfa5b0641f2e19e72067db77d24c49efee6ca68ecff9d8f9f2f4547ed6e59
EBUILD DBICx-TestDatabase-0.50.0.ebuild 828 BLAKE2B 3c254311479b89ceb31531583d914769ea20e1f39762199e8d1137b2766b09713cee74a5174da12ad80e8f1e31dd2c24af499316176e320b273730685ba9edd0 SHA512 8120f182c8c64a4615208080aba40b79b613a595ed56d50c8bd3508b63b8a032c0b6ff75941016c76590355b78b7e03ad5ee09f3e52a3960d0be318f81b72453
MISC metadata.xml 484 BLAKE2B 723e965490ab4dc9b3d5e68424585caa32fba66d98181097c9dec3cc03bf1fb7c68f32a8f51278258d1f0fb25430bdad19b6ae13b9c6c44bfe1200b61ec60906 SHA512 a5d5896c817bb4df43652e1d50c6725f59c1346c14cb2dc55cde911c06e53a0b934650d5538c6f653e8753c247c4424ef1918e9622a748c6ee6e87519d246aee
diff --git a/dev-perl/DBICx-TestDatabase/files/DBICx-TestDatabase-0.05-no-dot-inc.patch b/dev-perl/DBICx-TestDatabase/files/DBICx-TestDatabase-0.05-no-dot-inc.patch
new file mode 100644
index 000000000000..80cd825d632c
--- /dev/null
+++ b/dev-perl/DBICx-TestDatabase/files/DBICx-TestDatabase-0.05-no-dot-inc.patch
@@ -0,0 +1,21 @@
+From 84d5affecac79ea1a8641f7fecc9adf7691f4acd Mon Sep 17 00:00:00 2001
+From: Kent Fredric
+Date: Thu, 9 Jul 2020 17:46:23 +1200
+Subject: Include '.' in @INC on perl 5.26+
+
+---
+ Makefile.PL | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 225f785..022d09d 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1,3 +1,4 @@
++use lib '.';
+ use inc::Module::Install;
+
+ name 'DBICx-TestDatabase';
+--
+2.27.0
+
diff --git a/dev-perl/DBIx-Class/DBIx-Class-0.82.842.ebuild b/dev-perl/DBIx-Class/DBIx-Class-0.82.842.ebuild
new file mode 100644
index 000000000000..5d5716568b50
--- /dev/null
+++ b/dev-perl/DBIx-Class/DBIx-Class-0.82.842.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=RIBASUSHI
+DIST_VERSION=0.082842
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Extensible and flexible object <-> relational mapper"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-aix"
+IUSE="test admin admin-script deploy replicated"
+RESTRICT="!test? ( test )"
+
+RDEPEND_MOOSE_BASIC="
+ >=dev-perl/Moose-0.980.0
+ >=dev-perl/MooseX-Types-0.210.0
+"
+RDEPEND_ADMIN_BASIC="
+ >=dev-perl/JSON-Any-1.220.0
+ >=dev-perl/MooseX-Types-JSON-0.20.0
+ >=dev-perl/MooseX-Types-Path-Class-0.50.0
+ >=dev-perl/namespace-autoclean-0.90.0
+"
+
+# >=dev-perl/Class-DBI-Plugin-DeepAbstractSearch-0.08
+# dev-perl/Class-Trigger
+# >=dev-perl/DBIx-ContextualFetch-1.03
+# >=dev-perl/Date-Simple-3.03
+# dev-perl/DateTime-Format-MySQL
+# dev-perl/DateTime-Format-Pg
+# dev-perl/DateTime-Format-SQLite
+# dev-perl/DateTime-Format-Strptime
+# dev-perl/Devel-Cycle
+# dev-perl/Time-Piece-MySQL
+
+RDEPEND="
+ admin? (
+ ${RDEPEND_MOOSE_BASIC}
+ ${RDEPEND_ADMIN_BASIC}
+ )
+ admin-script? (
+ ${RDEPEND_MOOSE_BASIC}
+ ${RDEPEND_ADMIN_BASIC}
+ >=dev-perl/Getopt-Long-Descriptive-0.81.0
+ >=dev-perl/Text-CSV-1.160.0
+ )
+ deploy? (
+ >=dev-perl/SQL-Translator-0.110.60
+ )
+ replicated? (
+ ${RDEPEND_MOOSE_BASIC}
+ dev-perl/Clone
+ >=dev-perl/Hash-Merge-0.120.0
+ )
+ >=dev-perl/Class-Accessor-Grouped-0.100.120
+ >=dev-perl/Class-C3-Componentised-1.0.900
+ >=dev-perl/Class-Inspector-1.240.0
+ >=dev-perl/Config-Any-0.200.0
+ >=dev-perl/Context-Preserve-0.10.0
+ >=dev-perl/Data-Dumper-Concise-2.20.0
+ >=dev-perl/DBI-1.570.0
+ >=dev-perl/Devel-GlobalDestruction-0.90.0
+ virtual/perl-File-Path
+ >=dev-perl/Hash-Merge-0.120.0
+ >=dev-perl/MRO-Compat-0.120.0
+ >=dev-perl/Math-Base36-0.70.0
+ >=virtual/perl-Math-BigInt-1.80
+ >=dev-perl/Module-Find-0.70.0
+ >=dev-perl/Moo-2.0.0
+ >=dev-perl/Path-Class-0.180.0
+ >=dev-perl/SQL-Abstract-Classic-1.910.0
+ >=dev-perl/Scope-Guard-0.30.0
+ >=dev-perl/Sub-Name-0.40.0
+ >=virtual/perl-Text-Balanced-2.0.0
+ >=dev-perl/Try-Tiny-0.70.0
+ >=dev-perl/namespace-clean-0.240.0
+"
+BDEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.590.0
+ test? (
+ >=dev-perl/DBD-SQLite-1.290.0
+ >=virtual/perl-File-Temp-0.220.0
+ >=dev-perl/Package-Stash-0.280.0
+ >=dev-perl/Test-Deep-0.101.0
+ >=dev-perl/Test-Exception-0.310.0
+ >=virtual/perl-Test-Simple-0.940.0
+ >=dev-perl/Test-Warn-0.210.0
+ )
+"
diff --git a/dev-perl/DBIx-Class/Manifest b/dev-perl/DBIx-Class/Manifest
index 2b44dea80c5f..f15077014c4f 100644
--- a/dev-perl/DBIx-Class/Manifest
+++ b/dev-perl/DBIx-Class/Manifest
@@ -1,3 +1,5 @@
DIST DBIx-Class-0.082841.tar.gz 861367 BLAKE2B fe0956db1e61454af1e6ef8fc0be891aba8d6b6a676aa328048aacd4e4a1dd9d8ab7418eff722f1550f1410d2116af65bee74a1f880b311cb635f06d95d7f4f6 SHA512 a9c54c0cdb7a2dc93a4b3acb90974e6db80d5eaa95c723c0c3895c99b53be00ed182d4cdc6c5350ee7f120f29172c06494d5c647b8eb4643b91387c0ffee694b
+DIST DBIx-Class-0.082842.tar.gz 879377 BLAKE2B 2decf29c5dc1a84654e1e42551f0f9fbf5cf0397a61f1c8fd0597c2b0d82d9ce095e653dd9635065338327116ff52ec20e2e36f7b16083afd51e2b7ca964b45b SHA512 c8d7149536d5c4ebbfc866b0c143454ead37fda5ddb8fa43dfe2d56c2169be0fd8a46ec3b6c7cd22cb1c93504056d5803b5250ac151507ef4205fe53495e8f18
EBUILD DBIx-Class-0.82.841-r1.ebuild 2445 BLAKE2B 12feb9932f030e3f2381845e80579c46997b2ad75b9abb9ec4b08af0d61f460f7e239d9ef2f38e2bebcef2d8ac0d8d74863ebe90ba22569bf02dd248e6b7b6f4 SHA512 5874e0c75c00f2111e9b86fc383cd060cf14089eb768621d8cad91b9eab2e5721e77187bd0ce5bb68df9ca36a69cf9a6de3395c891f33da98de301bbfd37e2f6
-MISC metadata.xml 8164 BLAKE2B fac566c25d5dd2edb0df432555ab95ab859f5030b2a052f935fb67ca5fe37bf22cb36952697a5559643dff133ac9cdd27ad95e85a17f2104cf5c85a39ecd8b29 SHA512 6917d08d4024f6be55677c02f76fc9e8ed00421ae0a4dfb71d9c7dbe2392a8a39d2ba8db1c07e96a1216dabe005aa8cc0bad5447f5158b800d9e547fc80c5689
+EBUILD DBIx-Class-0.82.842.ebuild 2389 BLAKE2B cd6ace1ee9146a12dc62accc0b35744910c537ae46c3f7786e3338715229bd1b4cd7d14d372c675bc0a9415ff09bc03b637fac117ca538037329be3eaec288aa SHA512 92b404a5c315ddf1b508260acc68dbd58b6cbb3c629abeb106a0cc234447844854b8154cca2212a230580d1490656766f94df9598355553a6b484eb34eef7096
+MISC metadata.xml 8414 BLAKE2B 68a6a2b2c3731834aefd9dd99594c74614fde1b8f6da823b102c1f14a927a6341543fd58657008eb4fef29fdb84047c75bae45647aa20b3fcfd5496c43b601a7 SHA512 a00795f50a0ff33bda02674af060b03f3f14587613c090bb2dbde8d10329de0d35f7ec1bd302cd0fba0bfa3a5420fb6867c224a0f58eb91986161bde7ec67710
diff --git a/dev-perl/DBIx-Class/metadata.xml b/dev-perl/DBIx-Class/metadata.xml
index ffe6d8da1b5f..3d6c18777dcd 100644
--- a/dev-perl/DBIx-Class/metadata.xml
+++ b/dev-perl/DBIx-Class/metadata.xml
@@ -45,6 +45,7 @@
DBIx::Class::Relationship::Base
DBIx::Class::ResultClass::HashRefInflator
DBIx::Class::ResultSet
+ DBIx::Class::ResultSet::Pager
DBIx::Class::ResultSetColumn
DBIx::Class::ResultSetManager
DBIx::Class::ResultSource
@@ -54,6 +55,7 @@
DBIx::Class::ResultSourceProxy::Table
DBIx::Class::Row
DBIx::Class::SQLMaker
+ DBIx::Class::SQLMaker::ClassicExtensions
DBIx::Class::SQLMaker::LimitDialects
DBIx::Class::SQLMaker::OracleJoins
DBIx::Class::Schema
@@ -107,6 +109,7 @@
DBIx::Class::Storage::DBI::Sybase::Microsoft_SQL_Server::NoBindVars
DBIx::Class::Storage::DBI::UniqueIdentifier
DBIx::Class::Storage::DBI::mysql
+ DBIx::Class::Storage::Debug::PrettyTrace
DBIx::Class::Storage::Statistics
DBIx::Class::Storage::TxnScopeGuard
DBIx::Class::UTF8Columns
diff --git a/dev-perl/Devel-NYTProf/Devel-NYTProf-6.60.0-r1.ebuild b/dev-perl/Devel-NYTProf/Devel-NYTProf-6.60.0-r1.ebuild
new file mode 100644
index 000000000000..9771cb81e12c
--- /dev/null
+++ b/dev-perl/Devel-NYTProf/Devel-NYTProf-6.60.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=TIMB
+DIST_VERSION=6.06
+DIST_EXAMPLES=("demo/*")
+inherit perl-module toolchain-funcs
+
+DESCRIPTION="Powerful feature-rich perl source code profiler"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-perl/File-Which-1.90.0
+ virtual/perl-Getopt-Long
+ dev-perl/JSON-MaybeXS
+ virtual/perl-Scalar-List-Utils
+ virtual/perl-XSLoader
+ sys-libs/zlib:0=
+"
+DEPEND="
+ sys-libs/zlib:0=
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=virtual/perl-Test-Simple-0.840.0
+ >=dev-perl/Test-Differences-0.60.0
+ )
+"
+PERL_RM_FILES=(
+ t/68-hashline.t
+ t/71-moose.t
+ t/72-autodie.t
+ t/90-pod.t
+ t/91-pod_coverage.t
+ t/92-file_port.t
+)
+PATCHES=(
+ "${FILESDIR}/${PN}-6.06-cpprun.patch"
+)
+src_configure() {
+ tc-export CPP
+ perl-module_src_configure
+}
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/Devel-NYTProf/Manifest b/dev-perl/Devel-NYTProf/Manifest
index 931d33649ded..f1ec03f472df 100644
--- a/dev-perl/Devel-NYTProf/Manifest
+++ b/dev-perl/Devel-NYTProf/Manifest
@@ -1,3 +1,5 @@
+AUX Devel-NYTProf-6.06-cpprun.patch 1026 BLAKE2B bd57d3ea5e777345416a3325afd2e8658a831466ebad51ac0035bb834df79226b97d3b2b515ef1646530135bd6b06cf756a80b0275a3c9742203a7f8c6547e58 SHA512 6faca7dc185f0fb1b041ae7d88b42077dfbe9528755fa2e6b8511eba964ddb8f4fb5c7b065729343d2d54051657b4b4bddbe4159ba673e27fcc981a8cc8b0a2d
DIST Devel-NYTProf-6.06.tar.gz 468188 BLAKE2B bc236838873d1c85263f8e38d499437abf66e92d25ff58c3fc3f522e40c60b469e4b9e9d7ab63229cea84f8e86af7de6873bf76ff06527f72195ff3462344299 SHA512 e1fdab3208646ff9283eb606b856f0c25025479b55eddecadfdb7f9b2a9db144c003713b8abf333d03fb8ba420b7f3fbc885de360cd815d72e73ae3bffc27426
+EBUILD Devel-NYTProf-6.60.0-r1.ebuild 992 BLAKE2B d285dfb977d5772ebbf208d2844166f6486f326d3b04d43d6c6c19e68be6c6f3b4a227c3e1fa2071b9adfdb5ab6bec541d3141f3b6efb56db60e0928bd16856f SHA512 6fdf96cb35a4a0296ae2370e6156c35912247e6e44eb30a8db5e32eabc13df3d5727f7e09abebec9671e27598428ed2ca99b492cc25c5c849232f8f6aa0fbd2b
EBUILD Devel-NYTProf-6.60.0.ebuild 749 BLAKE2B de9e36c368ee661b03d64cdb058b46796d865ad5c2f8732fd3d2eb21e66dd51e855022a1e478a1356f4f535c52d64ad6cbb8bff9da1550f51c69e378a0b29131 SHA512 40f12dec199ae773c251f5a765fd8d4f7aa2ae63991fa2777f5ec0b1b97ca1aaf8b680fa911f0c2a92e0858037e720542753fc1146862783a3003d9dd486a7e1
-MISC metadata.xml 1236 BLAKE2B 4e79df0f41de5a49bab1992f6e8db0212b6befe5c91fe4f09dd70400b7fd8548b6130265b6235bc566e09385b7e92aecd7529aef4c14ebe3ba81ec1c9dfaeb9e SHA512 c113998d635e62bd13406b2c8112485f6b3bb0bf7efcf2f60d50eb176ed82fe4ed85263545c7ad5d680b752c12523ee7e1cf30eb4c9d3e20a6c256f89be75361
+MISC metadata.xml 1286 BLAKE2B f5b30bcad00536ca87fcf274a8de9da4db186ccfffecf5d4ef5bdd6cd44403f3dbe9a2ec797e47327c66cabe00557e274ff36f726ecdfc19c3bee4b39cc86382 SHA512 360f3f2cf927cf45d536ce625c4471a73a770269dc67c90f928ba7a61fcba59b91d48af053d9de11cb1686180d5af3d10b28d025017ecdd6541dda11ee86b953
diff --git a/dev-perl/Devel-NYTProf/files/Devel-NYTProf-6.06-cpprun.patch b/dev-perl/Devel-NYTProf/files/Devel-NYTProf-6.06-cpprun.patch
new file mode 100644
index 000000000000..786a525a7dcf
--- /dev/null
+++ b/dev-perl/Devel-NYTProf/files/Devel-NYTProf-6.06-cpprun.patch
@@ -0,0 +1,36 @@
+From aaa04b28c99e0d2bf244dbcb274b4df6fe6fa50d Mon Sep 17 00:00:00 2001
+From: Kent Fredric
+Date: Tue, 7 Jul 2020 23:08:00 +1200
+Subject: Allow CPP override in ENV
+
+When Perl is built with -Dcpp="$(gc-getCPP)", the end result is:
+
+- $Config{cpp} = "${CHOST}-gcc"
+- $Config{cpprun} = "${CHOST}-gcc -E"
+
+And of course, Devel-NYTProf uses the former, and so it tries to compile
+the damn header instead of just preprocessing it.
+
+This provides a correction, and an override.
+
+Bug: https://github.com/timbunce/devel-nytprof/issues/139
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 60025de..6786e29 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -59,7 +59,7 @@ utime time(), time(), "t/test40pmc.pmc"
+
+ # --- Discover how much of stdio is implemented
+
+-my $cpp = $Config{cpp} || do {
++my $cpp = $ENV{CPP} || $Config{cpprun} || do {
+ warn "Warning: cpp not found in your perl config. Falling back to 'cat'\n";
+ 'cat';
+ };
+--
+2.27.0
+
diff --git a/dev-perl/Devel-NYTProf/metadata.xml b/dev-perl/Devel-NYTProf/metadata.xml
index c4728df9c2ea..ccc473b06396 100644
--- a/dev-perl/Devel-NYTProf/metadata.xml
+++ b/dev-perl/Devel-NYTProf/metadata.xml
@@ -20,5 +20,6 @@
Devel::NYTProf::SubCallInfo
Devel::NYTProf::SubInfo
Devel::NYTProf::Util
+ SVG
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 3738d81f00f2..7f96275fce0c 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/SQL-Abstract-Classic/Manifest b/dev-perl/SQL-Abstract-Classic/Manifest
new file mode 100644
index 000000000000..2d582d620c8d
--- /dev/null
+++ b/dev-perl/SQL-Abstract-Classic/Manifest
@@ -0,0 +1,3 @@
+DIST SQL-Abstract-Classic-1.91.tar.gz 78466 BLAKE2B a22a7b0e0ad962140b7405cc9d0418fec6817c00cb72eb10f3484ef5ae276f2004d6e835e6a7ea210a23965f14ba5cbf5d935cac85168ab05e10987a926bf96b SHA512 a2389c04889ea09fc6512f955f8a383d1f51839f584a0be16aab33dec72b67214d0f22d55c666fa0ddeaa32e5c6fc91e1e50541d52e71beeb3b3d85af21a9643
+EBUILD SQL-Abstract-Classic-1.910.0.ebuild 801 BLAKE2B 6471f68231618d9fd1909ca6dba586fe911649a71984d4052a209f9407c2bfbd3717dc7863b97a7f6a61a869f0717337a5c5cce1802bb86ec8a6b50333e5cf6a SHA512 d1448367ee27b243ec6e22fad17ede782c7202f7b384d80f52c4bd7f634e0c4836350c027de91e30d2016b2a5d02675e17739f43afe800db5e38525b2fbaa6ff
+MISC metadata.xml 471 BLAKE2B 581970865125190b5e098a1aef93309d95710a7b6e97343d06a3a3107da6a9cb9fa0f79bfc0b8e3c2913533e0a933934e3f3375b5c124261c1185be719d34bac SHA512 170b0da79a6a7243b6b41faa8989868bb4022f3ded39e868163cc7c29c695639947bc57ea7e7a75243866e71e21d2decec35771d5516f842985b8ded83cbb5de
diff --git a/dev-perl/SQL-Abstract-Classic/SQL-Abstract-Classic-1.910.0.ebuild b/dev-perl/SQL-Abstract-Classic/SQL-Abstract-Classic-1.910.0.ebuild
new file mode 100644
index 000000000000..81843964dcb3
--- /dev/null
+++ b/dev-perl/SQL-Abstract-Classic/SQL-Abstract-Classic-1.910.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=RIBASUSHI
+DIST_VERSION=1.91
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Generate SQL from Perl data structures with backwards/forwards compat"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=virtual/perl-Exporter-5.570.0
+ >=dev-perl/MRO-Compat-0.120.0
+ >=dev-perl/SQL-Abstract-1.790.0
+ virtual/perl-Scalar-List-Utils
+ >=virtual/perl-Text-Balanced-2.0.0
+"
+BDEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.590.0
+ test? (
+ virtual/perl-Storable
+ >=dev-perl/Test-Deep-0.101.0
+ >=dev-perl/Test-Exception-0.310.0
+ >=virtual/perl-Test-Simple-0.880.0
+ dev-perl/Test-Warn
+ )
+"
diff --git a/dev-perl/SQL-Abstract-Classic/metadata.xml b/dev-perl/SQL-Abstract-Classic/metadata.xml
new file mode 100644
index 000000000000..6bec94bbd8f8
--- /dev/null
+++ b/dev-perl/SQL-Abstract-Classic/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ perl@gentoo.org
+ Gentoo Perl Project
+
+
+ SQL-Abstract
+ SQL::Abstract::Classic
+ SQL::Abstract::Util
+
+
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 7abf80f560bd..73fe95cca60f 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index 232c78e679b5..58ae07ddaddd 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -1,3 +1,5 @@
DIST mailparse-3.0.4.tgz 940428 BLAKE2B e3e33ecfa953766744a6980e0c681bb9b473d4cbf46179c8099f5483e8da46f47bba30d953d1c3629ea6d1719fcdfb0cca8536de3c3159a979cb7b2cde9ff9a2 SHA512 71eaebc1dc8a4698e60e170facaba16a5a9314bcb21c375b2f9a3069d7f1da819bfabc736b244e3f87131149d4efd9363120e77d8a078a0ede15113123d13ce3
+DIST mailparse-3.1.0.tgz 941058 BLAKE2B 050b16d90ba2cb4443df05eadb85d9835d1af8940bbb348cd5c6dd180f706519f483e9af5fe57ed35a5ea8e66a9e8a868848e7f2a1eca397c247e7f4aa1c110f SHA512 5a2a0786fc62fc47a60dcd52158ed86a1a58a26dc764b62abd763f784553f853c6644e4de76c85ad9133c8359d040c546c662b5f838ff7a5c88307aa21a589ca
EBUILD pecl-mailparse-3.0.4.ebuild 660 BLAKE2B 66ce0d63743294160c0373cea35497d689b6eb17f8a83e4fe106ea053fc67ebce72a65fada5161796da3085bd2398b9424398c386363b3a88095190639ba90f2 SHA512 c6823e9b33de01c7c04f2cf80bdf368c4cc560d33d4e4944aad24b40c003efc97a01ef8976408a1022445d3ed1f3f3639bcda51f700d60c071bb4255408c67a4
+EBUILD pecl-mailparse-3.1.0.ebuild 664 BLAKE2B 270d6723aa9b83db4a0de11a7199c56712f4bb23b1d16303461049f4f1bb36c524ed52000b21f4183047c78e27145097e818936c3cb5b1c34cf765d83933db0f SHA512 40c8110d0627a466452520d5627e97d195b9d888fee4284ca7358406268f27c8a9413f559bfeb3ac0b0734c3a22e66aaa302dee13def03cacb34d0b65f45eeba
MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.1.0.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.1.0.ebuild
new file mode 100644
index 000000000000..cb73196e10c0
--- /dev/null
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WANT_AUTOMAKE="none"
+PHP_EXT_NAME="mailparse"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+PHP_EXT_NEEDED_USE="unicode"
+DOCS=( README.md )
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+
+src_prepare() {
+ # Missing test source files in archive. Fixed upstream in next release.
+ rm tests/011.phpt tests/bug001.phpt || die
+ php-ext-source-r3_src_prepare
+}
diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index 83860cf43b53..8e96970391f7 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -2,9 +2,11 @@ DIST mongodb-1.5.3.tgz 1059580 BLAKE2B 23bd5f6b0f218cf55bd5713a770f3990d5c149292
DIST mongodb-1.5.5.tgz 1060017 BLAKE2B 475ca0f6a1cbd5270c9bde0f195d6092ef25441e0cee0a45ed378a868bd1ad27c7a77c4f4702b6f82004433805563cdaa728cbc11bb5beff83b982122cad339b SHA512 1eefc8f8e359a979082dc7808e89ff5418cd2dc73d4250638e33dc32cce40ef42502e9dbbb07303381e0062b84818568034f4e4cda8c8bf905513d00bf008392
DIST mongodb-1.6.0.tgz 1096156 BLAKE2B 16c3b1d07d31d29a214aba320347f8e40cfc4f0dae8b0713b02cd0e3ff98fd54b09217472f333722228efdfcae755bbdbfe58da7db89d4dda2893ba7b3b0e8bb SHA512 e75dc607bf41bb71a0fce3b73785ef4203af97a3e8b21bf70a80c2216e9530463a6aaca55b013a4fa2f3c4eb72405a25209935ea1a238475f990763af54aa641
DIST mongodb-1.7.4.tgz 1223416 BLAKE2B 9db40284eb2b70e242f26c1661923c5f33de8ab1e33a7e816863b61fcbc49040204ca556b1f384cab958f9dc2cf4e49e97840b78bd520a4e374b83210a964e5d SHA512 6805ce1d0958e24e1edf3bc9698bc1f4a9d31c26250624fd35aebf7a7d310af30050e1974cd9571f989303fce4c5522e793a8cb41388397df66e8f5fe0a648f2
+DIST mongodb-1.7.5.tgz 1223892 BLAKE2B c30a217d1170c31be00259f4bb58cfea186947fa0bf1653de32e228a8eb8d3fb25b52d7a5a9e16f6b311418d977f7aa00bf96ca9d7e9ac9a8fa7b6fe05eace8f SHA512 f0565adc42659d4070e42122d02a8306f29d6d70fe0b5e9a92144df346a8c672aafdf36613435b9dc8d50db5e98c2359fdf97408c45439d4d447257b85e93122
EBUILD pecl-mongodb-1.5.3-r1.ebuild 1009 BLAKE2B 4c1e9184619bc2f90558608f5ab5e2413c969e99bab0a8fcfb50b5a6fd6e5cbbf7f05f1a5155e2805a22aecee5f3a09e7e1c80d17b79cfcbfcdfaadeae6c13fd SHA512 7cf1a6fca2ce421abfd4f5509c585eff0627bd638749c2fda2be9be0fe12044ace79fab604cba54ba153d24cb8bc677ecb7c64c5cedd2af2e2361950e87a4b7e
EBUILD pecl-mongodb-1.5.3.ebuild 1019 BLAKE2B cf4f6615b0d70b685817105fb53227bddc4b85d9ef60000eed1a48b5f8601d3868ed5e7af096b7df7c4882d2fbdf22c56d21bf512c5b267a8893443e14ca7c3d SHA512 ddba025e9e91ab5fa2b065ebdef36b61510bd589afa09611dafe4e5b27f1af35019f3dc0ef7a6915d035225dcd13ef5e6cb91c2c0a9e6b0699f335d6b8d211b8
EBUILD pecl-mongodb-1.5.5.ebuild 1009 BLAKE2B 4c1e9184619bc2f90558608f5ab5e2413c969e99bab0a8fcfb50b5a6fd6e5cbbf7f05f1a5155e2805a22aecee5f3a09e7e1c80d17b79cfcbfcdfaadeae6c13fd SHA512 7cf1a6fca2ce421abfd4f5509c585eff0627bd638749c2fda2be9be0fe12044ace79fab604cba54ba153d24cb8bc677ecb7c64c5cedd2af2e2361950e87a4b7e
EBUILD pecl-mongodb-1.6.0.ebuild 1426 BLAKE2B 4b32da42a4141f6db317f0f77b5207f623e17560a6964d27700dbccd13caee470e29005fc97b2b1c3c1e5b59b40c5a84bb8d399b8d4b6f4c43db6bc972314675 SHA512 b185eb19982a9acd6a49b9be5f33da6106ba452d9402bd4b514f56eabcfc63637e111bfe4d0042483f826a4d5a8fb71714c900b9f398ab4c1d0611643bfdfc5a
EBUILD pecl-mongodb-1.7.4.ebuild 1361 BLAKE2B a42114c5b183685e405e147936b9b6b980ac052b8ac60121794ab444186ed927934748193fd4b66faeddaab310d37093974c9bd578880d168e5bf844e5121681 SHA512 5a677a8017f61f8097a19c2e64ba04e5a1e6e73b1218bf97f7612647913a2518dd82c1c0f5523cf366d71a9c55a64963fbbb15bda66eb1c5e346347bd6fbaca3
+EBUILD pecl-mongodb-1.7.5.ebuild 1362 BLAKE2B d2727126b6a41701aa3855f7cddaaf5cf9ca1fa69998a98a14d16509b87319c79d30c08e66483a85f08a8f7d6f5fac030357a6f5baa08f01bf211b844d2919b8 SHA512 7ec2c9c6bf1514a655222febae3bbf40ecfde2180308d65fdc8dbf7d4fdf50cf6c736a328384cc14abfb8d0eb6f66c9fedb18946c722c27b5683d6b71e5d81f8
MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.7.5.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.7.5.ebuild
new file mode 100644
index 000000000000..ddc120fee581
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.7.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl sasl test"
+
+PHP_DEPEND="
+ php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
+ php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )
+ php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] )"
+COMMON_DEPEND="${PHP_DEPEND}
+ >=dev-libs/libbson-1.16.2
+ >=dev-libs/mongo-c-driver-1.16.2[sasl?,ssl]
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-db/mongodb )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="${PHP_DEPEND}
+ virtual/pkgconfig"
+
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )
+ !test? ( test )"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-mongodb
+ --with-libbson
+ --with-libmongoc
+ --with-mongodb-sasl=$(usex sasl)
+ )
+ php-ext-source-r3_src_configure
+}
+
+src_test() {
+ local PORT=27017
+ mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
+ --dbpath="${T}" --logpath="${T}/mongod.log" || die
+ php-ext-pecl-r3_src_test
+ kill $(<"${T}/mongod.lock")
+}
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index e36ed5fa3a97..bcabf5f54288 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,7 +1,9 @@
DIST redis-5.1.1.tgz 245205 BLAKE2B b7177be5282b081562a446b1b37c7b46ba0ef382e55f27989d5586346a10f842d050ee46e881e480ea6b768e1259458df565d02193eda13a95704cd5455c1ca2 SHA512 eb6aa538d2ae4115634fd5841e3ccccf788cad13b99e0485fb2af43def85e93328012e5cef66d1be4bdd494be6f68de329a066e41b710e434f94f3ed3401bfee
DIST redis-5.2.1.tgz 251570 BLAKE2B 297d6130469735a53f6dfb6ffea8c7c813363099eb76f25619f0cbb05cd06f5ecad9c0f30c370e33985523cf26488cf133aa0a48a99075bc6d5796309e3d914d SHA512 de90bf65cce0cb8c5ea28415e4f7bfff23c8bb3dc96ddca3158f94be2e4bd051e13ec3f34429b0e8ceb436096520e3998f544f377d5ef7d4d1df4edba7f66bc2
DIST redis-5.2.2.tgz 251629 BLAKE2B e6ca740412dd1ba4ee960e1c71b3f75ebb1a1e2605bc93159395c657ab61eda4c8222b6e890a447c06cd1ef016e061861ffc5d8a6fd6e7e324353a148b54c593 SHA512 0020c572bcd24cdb479046727fba2d30ca87c9a7111c51e5fe3be0b85459e3e7dfc8892b690650de0a7dc80c1a8921f9de45590f6e60257fbf0534729c6e6f4f
+DIST redis-5.3.1.tgz 264485 BLAKE2B 51f68841d51329cbbbd2012e539351b3220dc1361ae5a3782b6c3e9620ed14b9a0b9097a0d6ba6e2fa60e8a794fd2ea57fff871d2fceb7bcdb4a2ab4a6d8789f SHA512 dca62e0e87d22c25818f0eb84ec0a4ae8ab4c1a2de295b7d56d10548c95448637e1b1ca86c55adf0f801fe22bf3c05fad4ff58f3823e5d74c506d041b64f1d4a
EBUILD pecl-redis-5.1.1.ebuild 1288 BLAKE2B 59d4de29ee1b61edede0c31ab5bb4fc40885c3d13744125f0838052299ead06f10965e5a5b9f269b368d3d4981e309fc1ee168f9a1cdbefe8eaee1554bd4c1cb SHA512 90bc2609cb87d3d3aacb72bd507a5895b5b531d243363676bbda1fb14548960b0073b61bac44e77b983570a9c116b2f369ab835bfd179e9af610deb0afadf994
EBUILD pecl-redis-5.2.1.ebuild 1262 BLAKE2B d29de451a8f863b87a77a356f52b781c94fd448c3ba1e4ab5c74a35e0d977d64a70412fc2b51f7e2267eda03dd2e886d1faa11bb4fe5bdf186682052f3b7b52b SHA512 1d975f3afc197a779295686e9645f24dd82611e326e1c89c387f3dcc8ce20f32cf68ebd5d2fe2f8451329c7d6c655ee998cd602ba0821227319ff84c85f705a0
EBUILD pecl-redis-5.2.2.ebuild 1262 BLAKE2B d29de451a8f863b87a77a356f52b781c94fd448c3ba1e4ab5c74a35e0d977d64a70412fc2b51f7e2267eda03dd2e886d1faa11bb4fe5bdf186682052f3b7b52b SHA512 1d975f3afc197a779295686e9645f24dd82611e326e1c89c387f3dcc8ce20f32cf68ebd5d2fe2f8451329c7d6c655ee998cd602ba0821227319ff84c85f705a0
+EBUILD pecl-redis-5.3.1.ebuild 1486 BLAKE2B 718fe2c3f07f6d6088ea908b4e0c41dc8a996bf09a5ac75c2ab0716afcb843aed71547cb10118df3b1d670ee678f6fd14b3b1acfb32813000fb47cad517c7a1d SHA512 98412ca22de8a169b782ff44b9120ad328e55a99e15fc162d067046c71b545db00c2a5179ee8b6e8814b302898c7ab4215151f0da8a90635903a8b8ef6ae18b0
MISC metadata.xml 383 BLAKE2B b7a47896565db2f132479963a5479262864421a8388bd262ba9aa8eb6445e0d351478530475b5dba12cc9cbbc33089a904f9945816d3009c75f09dcea9c4cfdc SHA512 da5c3918a6652f1f3ae58a5bcd2c5eb3308d764df1a14bae1658f5f2022ee364b6cd288c4a3c700cf27b70b2f967f66668c17ea9850fc48910005310d16125b0
diff --git a/dev-php/pecl-redis/pecl-redis-5.3.1.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.1.ebuild
new file mode 100644
index 000000000000..9f7ec9e88930
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-5.3.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="redis"
+USE_PHP="php7-2 php7-3 php7-4"
+PHP_EXT_NEEDED_USE="json?,session?"
+DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="PHP extension for interfacing with Redis"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="igbinary +json lz4 +session zstd"
+
+DEPEND="
+ igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
+ lz4? ( app-arch/lz4:= )
+ zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}
+ !dev-php/pecl-redis:7"
+
+# The test suite requires network access.
+RESTRICT=test
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-redis
+ --disable-redis-lzf
+ --disable-redis-msgpack
+ $(use_enable igbinary redis-igbinary)
+ $(use_enable json redis-json)
+ $(use_enable lz4 redis-lz4)
+ $(use_with lz4 liblz4)
+ $(use_enable session redis-session)
+ $(use_enable zstd redis-zstd)
+ $(use_with zstd libzstd)
+ )
+ php-ext-source-r3_src_configure
+}
+
+src_test() {
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ # Run tests for Redis class
+ ${PHPCLI} -d extension=modules/redis.so \
+ tests/TestRedis.php \
+ --class Redis \
+ --host ${PECL_REDIS_HOST} || die 'test suite failed'
+ done
+}
diff --git a/dev-php/pecl-yaml/Manifest b/dev-php/pecl-yaml/Manifest
index f1037f68856c..2c4e36e8dfe0 100644
--- a/dev-php/pecl-yaml/Manifest
+++ b/dev-php/pecl-yaml/Manifest
@@ -1,3 +1,5 @@
DIST yaml-2.0.4.tgz 39071 BLAKE2B 3a5dba0f6a16087909f4673543d64946e5929a5ef4cc616df6a4225aa2d274b2b5492b00ab0e95ed93f808bc2a4dd0a2f6d60c8c2ded078af35c4499042488d6 SHA512 138e5b4566800fc7d624baf71bc585d6d432755046e598ae9f4099fa565727e04d79bb171289a53eb9e5daa416ffee1b0fb4967c84976ac6cd6fc01b0a05fbae
+DIST yaml-2.1.0.tgz 39439 BLAKE2B 76cab7fe0c5cf4140b70dc86333a6a79c6f1684cef9e609b905d626e95cdf5542ef0a95a4e3b7e6b663adc81e240515c4d23b5f029c5519fa88e7178762171b9 SHA512 3731ca2b84e80599d7fae4f58efdd11e9920c672ea6e62ff6b0d57d721d3f6f12ca86efe88f63c324d4ad2b73d6947a21f6e5a47263538ca0d5e822b8fc7b8bd
EBUILD pecl-yaml-2.0.4.ebuild 1112 BLAKE2B 84a00a78f00c4a74bc1dc305835bd03452d9631e2644f72c4324e2f94cbbe5d1e7b24a8be62d4156e4a1bba9b0c55492867c122d06b024d187ddde0873f2f43a SHA512 b97fa3b263b1492eeb08c2d3f643d19f560e022b082f23fc38028e9e321ef25453ec8b3c3856335bc2122694e2ec5f66019606253428a268969e6f568648d90d
+EBUILD pecl-yaml-2.1.0.ebuild 1112 BLAKE2B 5794d333cad654ad56e0d65012a5425f62f274e44fe48d62e0a07553e871d2d3f87fd52385230c07698b1f86ccb71ff93b7ca8f7c3fc8ab7c325e02994ac2a89 SHA512 741b903df7feaad91b84c28fb680611ae9df3f7192dcf83cfbae68c53f6997906a24bd4e4106298cbefef0d6666f2fa03d20da12dd35eaa184054c33fe7553b8
MISC metadata.xml 238 BLAKE2B 1bb4abee8d968b36a69efa8f634c2d2e4422f5ac0611f123cf9794f1784e155a16cfd98ee209c16a745a58ddfa85d134c68a22bb5bde264c35ea285caa2d4d9a SHA512 560ff28e3776267c429b8d553d2dfc8991fa8d5845af5937c46ec68674d2b3c5cb922e557f43fcba113a70d4b3b5a32f39fc1fbed38de5781c7504fd526430cc
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild
new file mode 100644
index 000000000000..75dd43747a88
--- /dev/null
+++ b/dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="yaml-${MY_PV}.tgz"
+PHP_EXT_NAME="yaml"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS README )
+
+USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4 php5-6"
+
+inherit php-ext-pecl-r3
+
+S="${WORKDIR}/yaml-${MY_PV}"
+PHP_EXT_S="${S}"
+USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
+LICENSE="MIT"
+SLOT="7"
+IUSE=""
+
+DEPEND=">=dev-libs/libyaml-0.1.0"
+RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-yaml:0[php_targets_php5-6] )"
+PHP_EXT_ECONF_ARGS=""
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-python/GitPython/GitPython-3.1.3.ebuild b/dev-python/GitPython/GitPython-3.1.3.ebuild
index 4ac8b651ff03..316c61e6f441 100644
--- a/dev-python/GitPython/GitPython-3.1.3.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.3.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-vcs/git
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 1ac7e9f561bf..2d9879f706ec 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -6,5 +6,5 @@ DIST gitdb-4.0.2.gitbundle 1474197 BLAKE2B 93dc8aeb3a43f0950bec1e8dc0c0156543a0a
DIST smmap-3.0.1.gitbundle 263781 BLAKE2B 6e06586010814ce0f59367c7f9289dad4891ee1debbc020b192af3945207da05b1e34907f1871f5b6b9638706b9e2fdacf390fcfff6bd06af84b9fd80f7e63a8 SHA512 c2b6c0b295c2997ed53727d3d1458ae7ec5ddbde9c83349286904726865fc026a70161955498b1a06371fb8d937e7386b80b4ea0c2e5d1c647718e6dbea93104
EBUILD GitPython-3.1.1.ebuild 1565 BLAKE2B 188eee0c7d2caafe5aa17989fa5bec5f903b42ec644805b69b03fedb82325aaa3a47987062d685e5b427775505b6320b974cc594cff1ceb5878468914796cf9b SHA512 5153569d57e66bd7698de8e7adc3fcfa8ecbf79ab929364bd16a368afdb01390d79195f1880b17e9e9e2e67b22aa4713e812eeea4c65e00c19cca329fde47723
EBUILD GitPython-3.1.2.ebuild 1568 BLAKE2B 5bd129321bc6012432a32586c2c6c13dc96821bc7cb6f322cf7cb03763c06d746d4907e628c9376fcb154d2c45f52a6dd40d61f08372f91d778a8ccbba1ce331 SHA512 4688e66c53578accc218eaa25f4aa2fcbffc4c24782a5dd2a23067e6c60f9bdfb008771aee62f8dd98082766da16b4a71d777307a25aa5378144946d62d0aba8
-EBUILD GitPython-3.1.3.ebuild 1567 BLAKE2B a1d065baf60b83b194cd0d2e7751546e1540de4d49ecf5f941ea19c5864474ea004897c257c2052b2b2ecd6305a34512537976556695d1f238459456d9599b25 SHA512 be6f9cb0d027fa9424fc88661f34f721ce94d706f45d221539a52a398bbba32c274709bd66eab7ba61182d1b8c1f60bb530104e9666cc1ba2bea7bbe54c8f1b2
-MISC metadata.xml 382 BLAKE2B 9853412552202bb0134ea88f7eae6b36c5c17920cd2834bec4a487cd6e1e6a5421db13a5b5ca7de1bc366ca057c17e2d89f3ea0973023de76a0a0783065d6dc6 SHA512 3f31be6d8a7fc5622f56141778f1779ff092a7e50f6ee162edc7854eb84b896206382edacf678e3f53f513727ca67e3cce0b6b6f50be7cbc93533201533ebe85
+EBUILD GitPython-3.1.3.ebuild 1564 BLAKE2B 81b869b71a2083bf8be48161db0b5850237e0efb3a0544dede592b1126ef2dd89efc6c31f44033ef6adb70019563235f0add4a7b15079a073e48b490fe7d77d6 SHA512 61e8a53d669962d5d1ca5dfcf09b56b451e48aafa815939d707776257189bd9b3db7128946eb9c6f6c4c1f36d8b3a7324f4bad15b71c4f3d97fce97fd8dcecd8
+MISC metadata.xml 406 BLAKE2B ae639878f2162f9c2e313d10ba8122ede602251b28c0e82f36f73c92822d2626601bc6ce575cbd4bd5087acaea1a048079901ef67d787849c2061c68b2ad77a9 SHA512 2942febc2c1edbd075b64bdb5b6cffc2ecfa07231e8d210de4dbbaef3dd64a4df876dfddd8f1227ff2b1b9264d8746d951dc9e08db64bebddf0b0e1dea2a641a
diff --git a/dev-python/GitPython/metadata.xml b/dev-python/GitPython/metadata.xml
index 7e626312fece..1e0c7269c568 100644
--- a/dev-python/GitPython/metadata.xml
+++ b/dev-python/GitPython/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
GitPython
gitpython-developers/GitPython
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 02a568f73e50..482e65818aba 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index f6450c2efa8d..8426db548446 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,5 +1,5 @@
DIST PyContracts-1.8.12.tar.gz 91393 BLAKE2B 083c836a547540f2505cbc02c8696ad2ae236a9ba46529cc60d237c01bd113cb5a9d2729a70038e28f4a6f776cb17b119bdf9ae8dcd6269cbcd05412413aa758 SHA512 9abd5ab5203687ddd8a738998e63e8f3e397b9ba9b9ee22bda945dab4f0d460115ed8e825c9c551d4c067b0f39dbb5b8ca51d365623b10ee8e210efc4edcbf15
DIST PyContracts-1.8.14.tar.gz 92346 BLAKE2B 507fdfb313347d6650f21326b6b70b73f17cd702f25d06d97e5d84f84c9bf7f23cceb48d918727158d02081115344a4194e307caed59510265dacbf267774ab4 SHA512 95f8c76e35cc7549fefa069d9c354fc1d4a55dcab0f3fd322cb86aed92c7bfa75a06eabb7540ff991d590a90cdec781906b856291002a82ee5ab0072cdcf6ccd
EBUILD PyContracts-1.8.12.ebuild 1057 BLAKE2B cd6ba13dfe122c2d24022587a476a6b99a383bfde35f32a6b389d6e223cef42ea64b6c294b9d41fa6fd65ace8eb906e4ebd686992096b514f855319027d57478 SHA512 ea6b803b023e44480766d087a90170bb1e669ee729c2b67d41b24b78205873a345bfeacefe933b1a6c7a1b3abe71c9c6ac8abd2366163db2f29afe8bd367661f
-EBUILD PyContracts-1.8.14.ebuild 984 BLAKE2B 36cb035b6653ee7acfe46ab03e96e38e167ba5f38eff3edd30aa92a5546a52efc2fcf2f908e9d546194fb3be6fbfd58a0919b51fdd919b793d5fe088c131f954 SHA512 324c30ee8ce6d0c38e2f19287e99eec20f211b1b6ede66022f6565e4f34de6a29be78570f72cbf21fe8900e35da51a73c3f8fa47bbe469abf44fa869f41779c3
+EBUILD PyContracts-1.8.14.ebuild 975 BLAKE2B 23e4893af93b0ed82789e6b32850aa4ce91f544e89497e2a9b2d5dca886306cad613fcda616a596ee8b31aed94aa68308beaab401c9ad3c726c11739f4f87273 SHA512 864739777fc56a214b24311f8847df470c92d79173c32b64944826b174b79150d21474264ec9d2bbdae03966320e41cb2d05450b804d7434c8ff3be8b88bf6c3
MISC metadata.xml 412 BLAKE2B 168aead3c24da61c3e95e4d178546b196b07f4a1f5a51f3f5fe893222e209608e4f4d570a673c617085839756fbc3107e8544fa5db631429b596b6d7748eef9f SHA512 58a8491f4d6b1f1dca9c59036a0f3ecf20b71811d5696fa886452ebf5217f70ebc94615b86f16e130ad520ff39860128a801ed6c5566ac55a548985a56654267
diff --git a/dev-python/PyContracts/PyContracts-1.8.14.ebuild b/dev-python/PyContracts/PyContracts-1.8.14.ebuild
index 8cf28d8a55cb..52346ca9fc52 100644
--- a/dev-python/PyContracts/PyContracts-1.8.14.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index b68976241dd2..c211033b1475 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,5 +1,5 @@
DIST PyGithub-1.46.gh.tar.gz 2882667 BLAKE2B a65a359750c146947b69ff72a4775f6f1532420c3d15e0d7df34c69c3c552aa201740c1ea2cff2dd40daddf7cdc7743b4354698e1bc701f175a5f7dcfc83dd97 SHA512 1c03920434491b279e1709550a658ff125c0d91390160b1de5e5fadf5cf5eeb722477fd913f47ec686cce052a8c34d916de753ea36fecb227d955e60d064a0b6
DIST PyGithub-1.51.gh.tar.gz 2950990 BLAKE2B 214014b8205d954c559f2d19a38c7bc93800f40500c294397f16d55a4a027b7827910c93d98b6f5dd867bb0049ad1c9618c08ff72996f3717480ad17ce0ec64d SHA512 617b7bbc1fbd680735d5a57910ac1863cf67d9b2afc037d20fbd140a32aaa146164a76f73d76f2395aff1eee1fb13eac7a146c9cd05791b27db9a06a28d520e0
EBUILD PyGithub-1.46.ebuild 971 BLAKE2B f0c9ba982987b4fe9c1b7cc49b33b29d482bab811501f09a239852bf6de6a33c903af4502f9aeceab0831216dafdde0db30acba54eb9875d454cdab8c8198858 SHA512 d2c397a49946b1388b00df611ea6da08a1ccaa4299e06eaae9d3b3c50b6acab950c86e5d5b3a49b7abcc7fb0766b4dd771c48cf00009f4f791424e448543e29b
-EBUILD PyGithub-1.51.ebuild 767 BLAKE2B e06845d6d84823f891fcb5cfc2278193b625d536ba95e063bb0fe5fe99617155a2a38eca2d7e057f1d25e12752906e52096435d9de44d919d99a9a7c5bdab6a5 SHA512 a67b987c5663a5fe7b9f883e387523ccb04513ac176c2754ceae509998f1bf978b0892d87889e60baacb88033112cd1d5ba5a74e3c58cbc4f65249db6e27e6fa
-MISC metadata.xml 446 BLAKE2B e5a5f28e076db18ae39b757db4c480cc7d77314361c050df12276a8770c117140670067c4d1785d7a21fadd1d3435f7245a85f2bb251c57539315bcd97faadb8 SHA512 e29338330c42ccefee0ebeef682c8877a37c01c10ab9976988f846fb8c6d0a02114d0447a682499ff306810d2c12535a3cb031c9728eea016907382cca8ee1b1
+EBUILD PyGithub-1.51.ebuild 765 BLAKE2B 00f5df1c6be8b6f146d7c5f27eec89cd001c2c2cdf14ff1abd4aa84c089b76e42dd35e478b1aab3583b4ed6524a21cc68d391b598bee60c791df044fc3431094 SHA512 1ba906569f5ec5c07d5c7c387024cb0b6285a7f535ca04e3396d373815a2ea342e7e6be33355cb8e6f50e5aad8f4dbc556a1d6ce6a9476da79ed7a3249f0aec6
+MISC metadata.xml 471 BLAKE2B 1d1b80ed6b439d4e66af20c29e7ff4a2c229e29bcd9c3b8c4735c7e15f8176c0fcecd88d2cc26745edc52f99c75e9e70ffb70df1a1acc2b46c29d8801973effc SHA512 a6c6fb332c408fd4219ec277d30233693397b9badf6a8bf438ff65ae3cbb9431caaf4124c2291cf9cc9b1dc671f162bb6018de7ec6495f6a9740daf9a25bffb1
diff --git a/dev-python/PyGithub/PyGithub-1.51.ebuild b/dev-python/PyGithub/PyGithub-1.51.ebuild
index 0a466756e898..ae1dba794d4a 100644
--- a/dev-python/PyGithub/PyGithub-1.51.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.51.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
dev-python/pyjwt[${PYTHON_USEDEP}]
diff --git a/dev-python/PyGithub/metadata.xml b/dev-python/PyGithub/metadata.xml
index e39e603758de..5a8ef9e1446a 100644
--- a/dev-python/PyGithub/metadata.xml
+++ b/dev-python/PyGithub/metadata.xml
@@ -9,6 +9,7 @@
python@gentoo.org
Python
+
PyGithub/PyGithub
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index c37aec9c3090..10c3aa491715 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,3 +1,3 @@
DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7
-EBUILD QtPy-1.9.0-r2.ebuild 930 BLAKE2B 306d95e8d642e1e3b1443710b84e2875150b758e5633e318a185967a275d23d9877d64bb72c528c392843ccea7b22283788627ee3ca944f22965ec07997afd2c SHA512 2b2af09b75fbe7e9809dada369d690624294ae205dbee2492e375cef80a73fe8754a3b80806610f6550cb27f998944e8292bbbb19c5b6d373789967dbe510838
-MISC metadata.xml 1268 BLAKE2B 6efd4418ad56825334d01ac1a8fdc56697dbc80f8d5e915b73b366b3bb7f8d9d1f8ae664e666d19f0088ab05de8454335ee940fbc9e58a32e65a025378744602 SHA512 968f8cd0f4dfcb3217d100f88d41ec3f3301dc70c1f2648698967783161d2f7cfa816edb6dcc5f83aceda6693fb92bdf0d4a2acde7ad00c3ebc5bd8146b51b42
+EBUILD QtPy-1.9.0-r2.ebuild 957 BLAKE2B 7529712158e16deb5d222928315fa8169d7748bb762e7c920fbfaabdd0e108e86ebf0b1b075fbd1434d00f02a739d65959c2f2074f98d604e6c9b7e656eba650 SHA512 d36e3eac7df7340638b83d1b88bf877cc284c3f0112b7d08dcb82d2d42429f3e26c21bfe3fbe7177f526018b18404013ebdf2f5adc3e954a8a1da7d4e6c4bce1
+MISC metadata.xml 1350 BLAKE2B 1871f64db7308ed1232a209c8e4b93b061727ceb3c39f4c1ec1f4e70341aafb422f2053070de1f3327e98dd904fe1933bb750f60170f07c77fa7628ff1bd65b2 SHA512 6dc3acac74cb60e1b1c9fbd357d14fca2ca1c49d3ca8ff1fcbfd923c53c5e862c7c580857329a00fb1ba707f856dcf171e1441e8bedb7622501717c9bdfcbe62
diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
index ea4bf2866229..8b053ca3c20e 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -14,10 +14,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ~arm64 x86"
-IUSE="designer gui opengl svg testlib webengine"
+IUSE="designer gui opengl printsupport svg testlib webengine"
RDEPEND="
- dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?]
+ dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,printsupport?,svg?]
gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )"
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index 076f782a9d63..a19bcec18947 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -18,6 +18,7 @@
diff --git a/dev-python/dicttoxml/Manifest b/dev-python/dicttoxml/Manifest
index 7a05f7ddbec2..7974b97907e0 100644
--- a/dev-python/dicttoxml/Manifest
+++ b/dev-python/dicttoxml/Manifest
@@ -1,4 +1,4 @@
DIST dicttoxml-1.7.4.tar.gz 18190 BLAKE2B e8fd4974cbd9e83b72c25f28fa5595421be88ed5fbb1e64721280c4ead3003f95c98c7b4f12bced926f0c4af31b30dd76ddd49ddf297fa5f68eeb466d042ede6 SHA512 91abcf2b9b248717618e9fc1c8694e881b9deaa16438dd4674f94a22b4aabfdab3b13f95c3d44a60577d49eca82fb268f59b33d1312cf5388bdaf949a2865cbf
-EBUILD dicttoxml-1.7.4-r1.ebuild 468 BLAKE2B aee0af0d3c77f783b989730bc0085f184d8747a2c5d97358bb8827801c0a68de7712e764f1b0f35490d94f19598fe8745fababc9046bc5bd9fb5aecfd5cfbb27 SHA512 909a7b68f36306ad12d8c02460d6620fa2c2ab4ef7a65e49afa255f66de68a63578d9d04e918867550a51641a74ced49717cc7e3f96e3a09974b952a3b54456d
+EBUILD dicttoxml-1.7.4-r1.ebuild 467 BLAKE2B a73f50a2711cd7547e76e1be30087a7027253e89e68517cf91de1a255c7306a06bc5708760b0076bc36d88b5710a782d35118b8357aeb48f48d59ae4d007a515 SHA512 32075f6ba05bbc6d5c47d62f56a754d441054967bcd839a9006246235ba591ef1fb35120365bff0a780f9f4a61fd6539a24659ecfcf6238535fbf915852f9084
EBUILD dicttoxml-1.7.4.ebuild 441 BLAKE2B 8717b909f3c47beb41cf55c3a9b19831ffe8d146dbe5739a3eb9bb4d6446ebc8761c7c34f78552f8a48df54877f32556918734b18c3beed398e6620c0fe1c850 SHA512 cf65855d5773a41931f58d41a10cee6c2d8d8c2cd1d3d2f793ac9185b67ba04610175e88ebd4b389e009960f29844697d61cbfd39ccda9bef1f0abf3e62d66e0
MISC metadata.xml 503 BLAKE2B 6669e69ea7d5afa8edb064e78652a4b035f19dd786aa8eb531ed2cbdc4274a884330e7159b9a3ed051a28a0be531237bc88fe893961e5b59fec738a6d902a0c9 SHA512 3bf0c6926f48f42ce8e81c3111a625f43d043af1a95fc74eeb2463f789a2226591cea81b5f1ec1f4c12bbf365f3002f5f652f2dc7ce0ae2bf26bee1eceef75b3
diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild b/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
index e66ba0e7cee2..6c8c9f18938b 100644
--- a/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
+++ b/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index 8ced9bbba543..5a9f9081bab1 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,3 +1,6 @@
+AUX distlib-0.3.1-system-pypiserver.py 1553 BLAKE2B 8bb0c646798acecde6be0da96d82bb01c41eaff25cf6402a61b152835396ca26fa980f3fbbac2c58b8fb07b428d3b5c29985bd1fedb5f4195e8f4ef4da0c4a08 SHA512 d01cd0297951de3f1ca6684e828d1f4456f1a1933ddd934c4959982dafa6a818d0472a602a2af7b9721578bd5e47606678795e2d33cd5bde36a0b15243c1e364
DIST distlib-0.3.0.tar.bz2 848089 BLAKE2B 70f88b570229e2ab4c95bd8da0375aba189f66dec8defcf8eedf1be6924d93bd20b54c68e5fba867a6c68a31d4ef926ee2dc18ccb0391278680f30a62d0cd251 SHA512 01b0e7d59736414a241efdf883e4ee63eafe9614ce3b4147781a5750d25d6383543146c5277e3e0d3e11ce03693afd0331c6e3416776a6f84de7a4d9dadf3de4
+DIST distlib-0.3.1.tar.bz2 1068500 BLAKE2B 52135869242f71cc6d6887da6d9e20ffc6b46c84d8146393961062d92d8c0bd68e1309277f64fdec0319ff3c503b1caaba3d5378f5c081dca79573c8d9c2e6f2 SHA512 f259299176c45be7024b80759015a2fad120ffdde55b6abea0f7fb0335cee90809b5daedcb88abdfb68fd496284b2e478df622004b3750327bfc86807581116c
EBUILD distlib-0.3.0.ebuild 1574 BLAKE2B a4cc5c704c5c568d8ea95c5a9bc152474e1114843b796e7b75c57b313178895d5a6617b879608088481420a1030f52fd25142f4c057157809b3ac327ef0f471d SHA512 594ef111c28ded89a86a2c79a28a38ecc0f78ae96141c992ad0e61cc233d3197bac7e4dfea2d3c3c1665ff307f54d34179a28b481a1646c1fe2378d23d7765bb
+EBUILD distlib-0.3.1.ebuild 1297 BLAKE2B 0ad3ec72804752181069ac7296a557ec82a9e8b3c82d02a5d9d1b3b58e252c915e17fb790f442e54662d2a4faac99de7e02dd6dec11dfbc4ff21cc561e5f7500 SHA512 3cd46775ebce0547d50c36ce0cb3f7f990e1c127bbf8a560d47b39ea54ad2b7090492e7542237d6a16baed12f37425be368cff5cbbc9c0bb2d9126e376398899
MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/distlib/distlib-0.3.1.ebuild b/dev-python/distlib/distlib-0.3.1.ebuild
new file mode 100644
index 000000000000..349667d657a1
--- /dev/null
+++ b/dev-python/distlib/distlib-0.3.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Low-level components of distutils2/packaging"
+HOMEPAGE="https://pypi.org/project/distlib/
+ https://bitbucket.org/pypa/distlib/"
+# pypi has zip only :-(
+SRC_URI="
+ https://bitbucket.org/pypa/distlib/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# openpyxl installs invalid metadata that breaks distlib
+BDEPEND="
+ test? (
+ dev-python/pypiserver[${PYTHON_USEDEP}]
+ !!
+Date: Wed, 8 Jul 2020 09:24:42 +0200
+Subject: [PATCH] Use system pypiserver
+
+---
+ tests/test_index.py | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/tests/test_index.py b/tests/test_index.py
+index bc24367..623b027 100644
+--- a/tests/test_index.py
++++ b/tests/test_index.py
+@@ -52,11 +52,6 @@ class PackageIndexTestCase(unittest.TestCase):
+ def setUpClass(cls):
+ if cls.run_test_server:
+ cls.server = None
+- server_script = os.path.join(HERE, 'pypi-server-standalone.py')
+- if not os.path.exists(server_script):
+- logger.debug('test server not available - some tests '
+- 'will be skipped.')
+- return
+ pwdfn = os.path.join(HERE, 'passwords')
+ if not os.path.exists(pwdfn): # pragma: no cover
+ with open(pwdfn, 'w') as f:
+@@ -65,7 +60,7 @@ class PackageIndexTestCase(unittest.TestCase):
+ if not os.path.isdir(pkgdir): # pragma: no cover
+ os.mkdir(pkgdir)
+ cls.sink = sink = open(os.devnull, 'w')
+- cmd = [sys.executable, 'pypi-server-standalone.py',
++ cmd = [sys.executable, '-m', 'pypiserver',
+ '-P', 'passwords', 'packages']
+ cls.server = subprocess.Popen(cmd, stdout=sink, stderr=sink,
+ cwd=HERE)
+--
+2.27.0
+
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index af7758961490..1b36c21f9840 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -3,5 +3,5 @@ DIST distro-1.3.0.tar.gz 48067 BLAKE2B b8dc48dc82e96c674c5fedf2f55167fcbabacde59
DIST distro-1.5.0.tar.gz 54340 BLAKE2B 2a5bf45cdf41b9772a2e164aebe96a4e9952893b7462935938fa4939704c8dca67acc3e0a52e53d8722aa4405abdc7ad2c8d600dd397d1243bcceda4d5ceeb75 SHA512 14831fe1355e9ef4f58f273ce4a548a3fe438e95466b4b4f596b8110da51305d66ed77c2e40c3dbfbcbd1a66c74e23a4d4244c8bfdebc4b49b3e7ddcbff55b8f
EBUILD distro-1.0.4-r1.ebuild 580 BLAKE2B 20955997a8892260da7ae6bc2f293524de87d1afdbe1523fbe3c37253cdd8ac62dd6a1cc1835c428df8a6d3efd515641a3682bb258c3978413579dec82ef2b99 SHA512 72dd237a708854d166a549604dffc17286d79292ab6f5efb45246a6602860650a12ff0069327b0d8bc805ca35866edbd8a1da8ce1246fa3c638ecfb7837855a6
EBUILD distro-1.3.0.ebuild 535 BLAKE2B 59c2d7b16e2a061871db85f5679ed1ffef42cade07e4028e4f4bacce59052adaaa3b2d296d9d45151ae131653d90660b1b5b1d144b9b7653ccf27e9c693aa063 SHA512 0f89047367718413042562512da81da83015e8a0969a4f025fe28ea7f58ead77787ce4388ef31658ec57f6d753f3178b7b4fa142cf6e2def2b857d25e90f4fcd
-EBUILD distro-1.5.0.ebuild 538 BLAKE2B 59d42a36541025156f4401c86b909bea0ec52c7f6d7bcc035903df7fea572d079aa4122171ae386f832d653063b923860f7b7da2368ff05b3b7798027e3611c2 SHA512 ae3c8b725531a702ee15bad2a9a646ecad5d8920d42436b2e856a6d3bba07bd724e5f7197b4020a08e44f35b4d012b3864d4029c8a7452b0f4e582bfc3566715
-MISC metadata.xml 813 BLAKE2B 7ca7237a784e0d321609382bb6427a39584f9ca36047975fc76926628d5b4b5d54543762bcec7a43eacfa91ac056a96d38a0e71a6baed93b18a9849b2563f502 SHA512 2d9fe5a2567f86d987d950a78d68f09ac45b1a50ff02d1f1c2849c381de1a5a2f164fd6850f427650789a0274af974e23c9b8ba7ef3b37c81ad653b3ba85e0b5
+EBUILD distro-1.5.0.ebuild 534 BLAKE2B 8a61e5948cf5ebcdd298d65b90dadc5bf24fe1a649dfea84964edf8f0bcf589b8b03967db2cee8976ffbe65d22d453c19df6f01062307afa554444fd289f83f3 SHA512 3f22c3a3b8baee8218f9b7022a1ca91163c49e15031bd2ace30d1b74b8ab49a57a67c46f72aae6ad21a01afe3b1d1560481b18e14428502875ad4120dd175849
+MISC metadata.xml 838 BLAKE2B 899bf57efe9358f0f33df59ef8802cdb0e9d26c05ac99289b7d3765ddf2a5cb65452874aaca7db3774c76564c4761c4f71ee139bad080cc1e62472794de29b8e SHA512 55cab917a2b67bab65c1fda28693020efde74e905c09d077dd2562c2e78171ab33a2a4190b458deb5bfbeb3b9ed3fd66c61e69cbe569f1640d135c46a66477e5
diff --git a/dev-python/distro/distro-1.5.0.ebuild b/dev-python/distro/distro-1.5.0.ebuild
index 24643b164d39..ed96ef70587a 100644
--- a/dev-python/distro/distro-1.5.0.ebuild
+++ b/dev-python/distro/distro-1.5.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
distutils_enable_tests pytest
diff --git a/dev-python/distro/metadata.xml b/dev-python/distro/metadata.xml
index ea74de39e0f3..5a9e015bc43b 100644
--- a/dev-python/distro/metadata.xml
+++ b/dev-python/distro/metadata.xml
@@ -13,6 +13,7 @@
function, but it also provides much more functionality which isn't
necessarily Python bound like a command-line interface.
+
distro
nir0s/distro
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index 6fa551259f92..b21cdf38a0f4 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,5 +1,5 @@
DIST dj-database-url-0.4.2.gh.tar.gz 6125 BLAKE2B 1f389d20a8d38a228f10d603444fa6cb23d3b17729747e0ffb6e917494f5ad8371b64ca9b1ebb233bcd9c11929d44bca7adf5bd62637c71763413bb821db0f65 SHA512 095f22e8af3770ac2db0730c54980f957ee41456513f8e6b8da3147ec333698274a0a9e5b7d606b840d2c78906c6aef25c49df1375c2f8b5127c6270fdd4c2e7
DIST dj-database-url-0.5.0.gh.tar.gz 6309 BLAKE2B 72647f8651d595b4020161b15364836b8483bf8a12ec72e434bc9d0583878ee9f4e4c76110581f285adddac3e7c2d7bc071f720a7fde91c84c3ea53b6c979300 SHA512 541d5177bff0fcc21372d2d9dc699ba11de1b1cabf10d61fb9f1e844a6dd4d46df5c7fdb6ccb4505cf984e41d7a2ae4e3af5e7d05072b0ed6982499eac5aac66
EBUILD dj-database-url-0.4.2.ebuild 529 BLAKE2B a3aa8914b0a3abeead5f266d45e58ec5d0fa0312b5cadfa14a8f7e7c44e5ca8a12e7c9ebf21d591bfc87719f88e75f049fa69c787baf7170efccd2ce35237039 SHA512 36bb577718d56afefe5f41fa499d1525fdaabbc6473dccd0c3e6357f62c4e38aa5c5b475f0838bb6beb6c0e4b82a53f5fe5ea11902ff739e996e4ac9dba3b434
-EBUILD dj-database-url-0.5.0.ebuild 531 BLAKE2B 23d27e333ac142e1845bd71d152efeacc9736c2796676d6831352379d73b1ff85aa854efeadd81ff14613f52046bf596dc22cd029d84dc23f5b9eff0c2d405cf SHA512 dd3a4b08f6c4302ca35b16b2ead1bf660d9ef39cf5121ce759f359e74946624b273e6516bd14b6ac1b2dcd58da5f79d449975597a3b266994aa1fb98d8e56e37
-MISC metadata.xml 398 BLAKE2B 29d967c2376c10347e128d1e7cad28c9a8346b7ec4a1d616a121b676fd3d56b4c0a1b4bf890bfed47b3fb244d9fa0ae01bc28d8b4066fd9289c72a436db4f647 SHA512 c89283a38f9c6f8ac3cae38a7defbdfb1c5b9dc06f31ed8073fb12d879828976a57d4019a6bba5e7af74a19e9088ced1ca03e585d52c45cca67caac2839b64af
+EBUILD dj-database-url-0.5.0.ebuild 529 BLAKE2B a3aa8914b0a3abeead5f266d45e58ec5d0fa0312b5cadfa14a8f7e7c44e5ca8a12e7c9ebf21d591bfc87719f88e75f049fa69c787baf7170efccd2ce35237039 SHA512 36bb577718d56afefe5f41fa499d1525fdaabbc6473dccd0c3e6357f62c4e38aa5c5b475f0838bb6beb6c0e4b82a53f5fe5ea11902ff739e996e4ac9dba3b434
+MISC metadata.xml 423 BLAKE2B 8ffeb653121355367c526ae43a04bc378066ec1606fe4a034553d0a53edeb241443fe02d28917ea46ca5c5f49a8ec56a88e951e68a7e2d98013ebd76be66dc4f SHA512 e7ce0313806e3c4ae511bc1b60bbf3f7921610c9fe889166658299dfd0cd01bf01f5a4d47b1a166569e9365b0d75e980e8bf463f63fb82c8134a20e7b1c74ff9
diff --git a/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild b/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
index 7242cf18e324..87cf652019e7 100644
--- a/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
@@ -17,6 +17,6 @@ SRC_URI="
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
distutils_enable_tests unittest
diff --git a/dev-python/dj-database-url/metadata.xml b/dev-python/dj-database-url/metadata.xml
index 8dd62fb8e9c7..85f9085eb45c 100644
--- a/dev-python/dj-database-url/metadata.xml
+++ b/dev-python/dj-database-url/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
kennethreitz/dj-database-url
dj-database-url
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index c1e71f96e0e1..0234436a4f03 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -12,6 +12,6 @@ EBUILD django-2.2.12.ebuild 2357 BLAKE2B 42d33daa2c3ebf5c776f79617fb943a085f3f19
EBUILD django-2.2.13.ebuild 2357 BLAKE2B 42d33daa2c3ebf5c776f79617fb943a085f3f1965daf40033add0689634d25f16972cb5efb545416a3add02e7d13bc337e6a9de43a830a3670124dad93a4a8c5 SHA512 8627be383807f5820991ee57fca3aa3c213b13c751f57313e5148ab8eac1fed002b46bfdf5523b1e907f468202390b9854373e2522cba6be71f58b3be493ea56
EBUILD django-2.2.14.ebuild 2366 BLAKE2B 8796ccc566d580e69f6c12c663a7a34311f9cb11c3d9a9045c32396523c1c33e2a5c73aedf52e177bbf09526c0435533dc7ea8b85b6c3ab2cc5d41afd65b6023 SHA512 2733ecb9d91cba09b97a223c049d9f84b6bd228da4936177abc5dc3e0a50b97074071e120ac357c4c87f7d8893cd123d164f010d7a453ca18c96f253ccd56f2f
EBUILD django-3.0.6.ebuild 2346 BLAKE2B e5d6bde66833c279478a0f612f3e6aca060f7dfdcb0dc1f001ad9d4669ac67bd5ed9acec5f6b58020fd7754c477d86ad690598a6043bfba86fd1b3884229af03 SHA512 ea656dc35b8ee988edd874a7a2119754442c5c56a828e22542081e1f16e1dd1425a88f3d1134f5c21a2a86a00949ab44f5dde9e5fe2350f7d23020d4f38279da
-EBUILD django-3.0.7.ebuild 2347 BLAKE2B dc296dee8bdb25be233fd02b686e1b3e34d46055ef9194ec2a0c3cadb751fcbe05e17cdd2793233b7657b0cd01a593f3770b805c6fbb4af3514212bfb853ef7b SHA512 c2a32dc0e7c29d6eda9e106d1a1444034a7fe826a5e8dabe96e39d6c818ea28416fe88f73dbfb8d8738d9f1745339ed92fa967b91e5eb5b19fc0d753160d304b
+EBUILD django-3.0.7.ebuild 2345 BLAKE2B df121372d602665702055d198a27db6f664e21a260f073541eac8d665287e4fac41320da469e11c67c88cb50b83c5376f7f46d7a673fc7ef6d88fe193e2e23f0 SHA512 829896b078746c0226aa193f65d9d74105039f458830d0a4d6ec062897242a8cf543fbbb271b285128c02c77e9b85752f79cae08e6edd90b49e321742183b084
EBUILD django-3.0.8.ebuild 2347 BLAKE2B dc296dee8bdb25be233fd02b686e1b3e34d46055ef9194ec2a0c3cadb751fcbe05e17cdd2793233b7657b0cd01a593f3770b805c6fbb4af3514212bfb853ef7b SHA512 c2a32dc0e7c29d6eda9e106d1a1444034a7fe826a5e8dabe96e39d6c818ea28416fe88f73dbfb8d8738d9f1745339ed92fa967b91e5eb5b19fc0d753160d304b
-MISC metadata.xml 374 BLAKE2B 79d646d66b955dfbc419783bcfe7677f92472872292dbe726e55bf873d066be9365664e14ff1d190578b0294fe14dcee1c43e648bf2508cb2ceff4000b6002b8 SHA512 9aa0b388987c115e18e0aaa8747605e67fc8c8b5125d2a634dfae2ba8c6627963029fe913401a0647026adaa4d0037d91075a46d20f924f4d4f8d45bff195cff
+MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-3.0.7.ebuild b/dev-python/django/django-3.0.7.ebuild
index fbc688b75cbc..7f323539c127 100644
--- a/dev-python/django/django-3.0.7.ebuild
+++ b/dev-python/django/django-3.0.7.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
# admin icons, jquery, xregexp.js
LICENSE+=" MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
IUSE="doc sqlite test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/django/metadata.xml b/dev-python/django/metadata.xml
index ca9edb307f40..11e4ec4f152e 100644
--- a/dev-python/django/metadata.xml
+++ b/dev-python/django/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
Django
django/django
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 82ba5d2ecdd0..e0c34e2e8700 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,5 +1,5 @@
DIST dogpile.cache-0.7.1.tar.gz 326127 BLAKE2B 358391033d1d22b2711052f1aa3003c0c5f2da42b33b3f4fbb2d582418b0b42695db5df638dabcb9ba81ba414d142ac7f52a6c80ea645f5fcba12ca21122a495 SHA512 39c0a1d3d5027bc61cc69eda46c846c72d09892b2de0ea2e9545b1f710911dce8726b4ee4a0daef0d3c409a16733920d437f6e833a5b3f55ccc80267bb0da39c
DIST dogpile.cache-0.9.1.tar.gz 329015 BLAKE2B 23a33ccf024153e39bdccebefc33c866990733432abd2bdd715a0f180f0059a2ff8315024d59d3ad9c79a01561fda3a802a867d359961d7655bdf790556c7a2f SHA512 7d84325dd7ec2d85027472f07cddd51f495b75dc9dbbcbf26bad7aaabfee8c2da99e0c247851282b228528a87e54d98e04d8451a3ca3a571e84a4a2bb33e72f2
EBUILD dogpile-cache-0.7.1.ebuild 914 BLAKE2B a7e57119a7510f03420d5368c4bc05c8866f14d62090d18ddf8125eef1ce9d63ffe5bef5cf216a66c495c42683d03a463e1a6f7e2f99f97a88ddf85352d8a9da SHA512 bb34950106c425e39f9177455336e07799b996e92885ad771f5d1876f03a4907da91fc4a1e02bb81e97eef77af1d8160c421ad5a029666a485fc97956e89d592
-EBUILD dogpile-cache-0.9.1.ebuild 834 BLAKE2B 2494482ebf182b657d32a6d5df9b2abef8bb73bc28b4e8ae17fad0e498b0c7e58d52684a2d29405fcdbbb6784def2d2d72b9c2df6ff5c2075218ff3cde4798b0 SHA512 88d8de4defadb2027037a75f21745def85a929640bae912b67af27837c48c91da2591fc904df95ed8161d52cf1ed120e8eb692e3a956e30ede3024ddbf602032
-MISC metadata.xml 716 BLAKE2B 790b3d6205c7f01a122bdc92250cb507408742e973a33dcadf4be9180d4bc4d6c77a9a9283057b88406d852a461dbc46d834b6a95309b7641b2ad78430b0f553 SHA512 7d260f1511dd2507f67149e1dda7a5ef5e5fee21bdd45832d141cfda5794b32b5b99a31e0f351da5f076fe481f14c7b420cf11f5b14587a1858b61325f4ff59b
+EBUILD dogpile-cache-0.9.1.ebuild 831 BLAKE2B fe890406bbe1b6cb769852b59ac7b9d16dbe8a77f611ef8c2b4b073a4753b3c4dfcecebf17c9dbe341661e837ffe699aafb7c806fb6ddf5e8013867f52566bb6 SHA512 ff7e7a67f4a3c99bd380358d8cce7bb06c8e33568cb2611aca6db9f8d3f8d6584fcee48b0297c45aec2431bf28e90cbf436d7d1b9964f81b04e08328007cb33f
+MISC metadata.xml 740 BLAKE2B fe8b05079022fafaebe7967c8d39c25c7bb3c43fdb3f87ea3d44356cc97ffed18f2209b60134ee6fe87e0d07c6124591e27ca71327fb3846ccda68598750bf41 SHA512 b233c2a72b4472481068b8f7ca0f646b876376b7e0b08a47e56f03851c95bab28c30fb1f58ca59f9f3e73f34cffc6cbd79c66342648fe3d52089b55d4f01d86b
diff --git a/dev-python/dogpile-cache/dogpile-cache-0.9.1.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.9.1.ebuild
index 2f4d32066ff1..2acea6ee6faf 100644
--- a/dev-python/dogpile-cache/dogpile-cache-0.9.1.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-0.9.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/dogpile-cache/metadata.xml b/dev-python/dogpile-cache/metadata.xml
index 823622b3f9e7..d7821ac6f812 100644
--- a/dev-python/dogpile-cache/metadata.xml
+++ b/dev-python/dogpile-cache/metadata.xml
@@ -14,6 +14,7 @@
continued access to an expiring data value while
a single thread generates a new value.
+
dogpile.cache
zzzeek/dogpile.cache
diff --git a/dev-python/doit-py/Manifest b/dev-python/doit-py/Manifest
index acc04d5afa6a..95719182b281 100644
--- a/dev-python/doit-py/Manifest
+++ b/dev-python/doit-py/Manifest
@@ -1,5 +1,5 @@
DIST doit-py-0.4.0.tar.gz 16534 BLAKE2B 390a7ac17efc1938176ff6aad8fd404b8a0155e82dd2f346cd416d0357cc888e1b3e84dd9ddb19260bc9ee463e013ae544032199967a6ace7d63840a178e0933 SHA512 72aa850928c99bf43eefd827334b361243da3b26283fa358ed3f7fba72d1916b1cbe50e581d3d62ed3b4f0efb9b5d1e7f59c3dc913b2ee27e6503bf4e47def33
-EBUILD doit-py-0.4.0-r1.ebuild 842 BLAKE2B abe8e6e004ad8b0fe6ce2ac011cf875acc83e61a053eacba8eedcceb3cc19c2fd9b6d3c8dd154ced431833a53789b1331bfc939cb31d5963b66e60acbd575036 SHA512 75e4d2e5fbece04f7673c53bfc033ae4590f0c09d20f7cec4dbcfd5affe12db9cf7f01772eaaeaf538fe1175ec18f18e727b84194676af147da4cdc17b0b2e09
+DIST doit-py-0.5.0.tar.gz 15174 BLAKE2B 092f21549d3c088baf8a96b8dd7575304d08c7ae7b0472e7a890159247422060af06c1cc14064cd608bd59e71788067c5374953b16f4511971bb3018c0245cd4 SHA512 f9e70be30f47b7251bdb479762dabe655be898f9fe37fc5ac6608110a82863a08002271620569745f9ec2f47c03529c044a6ea74244b8bb6438b3fbe7e4c28f7
EBUILD doit-py-0.4.0-r2.ebuild 587 BLAKE2B 21080fa793b57933ba90b15e3e32d40c4ca8b4855ef4d7a40b714316a039e39e6c0946892460e0aa4b9361813e7b4af3f0d722735366c290da782e6f7e5167ff SHA512 fcfb1417b7715116cea18f3cc4bb970e29e410620e5ab6ce64cc02f93bdd0439114a0fa05a6a654eb7f80b745aa729321dde6df23500d6ef728d39cda99fb466
-EBUILD doit-py-0.4.0.ebuild 956 BLAKE2B a112037e1666a50a6d07cf4b3201d6754c58f96ca49e40798bbfa257ecf4131bb04924339744d9d3374f1090066d8247dea41b68d07f6cbea93d94abee023ca4 SHA512 0cde978075daf4c88453346d1fe42b21624605410f3072396f4722d0fb577ec990c554101b5d7ac00a44861dd813da0d1f93296b340486227df7f466ab13aa23
+EBUILD doit-py-0.5.0.ebuild 612 BLAKE2B 25e00ecc9e2fd3aaa7f5847f7db7dfabb27d03ffef3c4ac2368508a6c04b4ab15888c32a888733e0afac8820a7fd95fa803926e1d89c1a86f8d852721e32e222 SHA512 fd059ae7e6306e0480cc2a5b2f84585860ead40d88eb2dd68f71aacdbd96c5cf0576b70d8cad123d64a01fd2c9f4763deff757b8c8306d875732d7bd1805e924
MISC metadata.xml 518 BLAKE2B 6051376faedfbd03dcb61444a4ee626766ce101e8c555706a3869d97c2b6ca870a1c4ad0df077cc74fa448bf61705513ed235baf228b9c32872c802f2baae9ea SHA512 8626185dc768f468e68c3cf7e731e0183762f7a07472f429e33d1576898a2cb59d3178eee5f729dfc8da06481156004c392e39ead68bc94808cb32e0f861293a
diff --git a/dev-python/doit-py/doit-py-0.4.0-r1.ebuild b/dev-python/doit-py/doit-py-0.4.0-r1.ebuild
deleted file mode 100644
index a23ebb2f495a..000000000000
--- a/dev-python/doit-py/doit-py-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="doit tasks for python stuff"
-HOMEPAGE="https://pythonhosted.org/doit-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
- dev-python/pyflakes[${PYTHON_USEDEP}]
- dev-python/coverage[${PYTHON_USEDEP}]
- app-text/hunspell )
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="
- dev-python/doit[${PYTHON_USEDEP}]
- dev-python/configclass[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/doit-py/doit-py-0.4.0.ebuild b/dev-python/doit-py/doit-py-0.4.0.ebuild
deleted file mode 100644
index fae2a43f880d..000000000000
--- a/dev-python/doit-py/doit-py-0.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="doit tasks for python stuff"
-HOMEPAGE="https://pythonhosted.org/doit-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/pyflakes[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/coverage[${PYTHON_USEDEP}]
- app-text/hunspell )
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="
- dev-python/doit[${PYTHON_USEDEP}]
- dev-python/configclass[${PYTHON_USEDEP}]"
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_test() {
- py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/doit-py/doit-py-0.5.0.ebuild b/dev-python/doit-py/doit-py-0.5.0.ebuild
new file mode 100644
index 000000000000..b7b756066e47
--- /dev/null
+++ b/dev-python/doit-py/doit-py-0.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="doit tasks for python stuff"
+HOMEPAGE="https://pythonhosted.org/doit-py/ https://github.com/pydoit/doit-py"
+SRC_URI="https://github.com/pydoit/doit-py/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ test? (
+ app-text/hunspell
+ dev-python/pyflakes[${PYTHON_USEDEP}]
+ )"
+RDEPEND="
+ dev-python/configclass[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index 5032657c3209..a503c6639b84 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,8 +1,6 @@
AUX doit-0.32.0_pytest5.4.patch 2862 BLAKE2B 3a3859fc2a5a2c0f533a3c4a300744d5c4b73edc9b255f54267c6018218c393478e2feb6f43874250ba931effeaa576cfb38cec5cb7f934031071744c0d3b2f0 SHA512 2f4d251970e042adc631a9912705a0f97bd693f5cdba3e89fcb912c91f881c2c57665bd32a28630053fb1e9c2ebce022b40974a303c5e808ae0d2008f07c3e8e
AUX doit-0.32.0_unpickable.patch 1371 BLAKE2B c03d757a99e44bbf7c7dbcac84295e7514055921d2c3a12bb3fca2fbc7e8320c8be450a5c101d39b51b8f0bb7fa1b1faa3c58a455ab5c27a68f6e03a70ea9763 SHA512 2d17f32876897a6b73ba7936eade594a0a40f38a27d08e14603f3aceb9b36426d810e0dc0b13b385c8e4cab830976637ed4462014dab7202226d3bb3f745cc8a
-DIST doit-0.29.0.tar.gz 222341 BLAKE2B 8489568fe9236af04f87debfb4889840aa162d17d20f82ac0a9a22d1034b4c58976cd6829486a15b941ac1f50e7137c052fe332657c2b3f529fe2345bbcba2fc SHA512 a686457df31b414d0c3797789e0ae1ae5cdfa3674025236419cb59b254f342cd2db07911ef18b2cb576d8d817b44035b9372265b34b786b2779fb7074b394de1
DIST doit-0.32.0.tar.gz 1437939 BLAKE2B 39134341582cd964630a1667c78b0e44eeb32406a06e3567123b820fb61cbee0f6a7c8879a84eed750860a365aa4c792e461bb1534c66e4f20a6289522dc8183 SHA512 d5c28a0c6a38648aeef58027b2246fc26360e133e91933f2244bd484f70d6d26110acbfec19c74d53c796e0bbae07a4bf6d76542d45e8b1a6b503c186bf2a68a
-EBUILD doit-0.29.0.ebuild 1861 BLAKE2B a1756f901009f5e277bcd5099fa63888b160b90d30e41425e3cae126c60af62f7ebaedb5378c2b4461c7f5a7e1057e8697d4c47e374f607fbf938da512f52453 SHA512 a0a45c33271e4dce0a7cfca52c80a2d4371fd384288249c3abfcd130d9b98256c01f1c2456be1923f592d3a10550eaaba8e578c05a5170cbe695bbbc3fc9a5fb
-EBUILD doit-0.32.0-r1.ebuild 1350 BLAKE2B 8ba9a1cf72376eb718b3893fe357b13cd028c9ba9f44dc2664b3127d6c23b2b4dbe7426653570a7d830ab73ecfe4698d9169c6da925c9237cf9603ef8e295505 SHA512 8ca77b611596f7a3bb990d2471a648e575804cd14dd2e018326d563663cebaab9023cc7c07bcfd742b4c0c300bda2d182c1685c377b6be912956a4dcc9241d45
-EBUILD doit-0.32.0.ebuild 1846 BLAKE2B b0f30a44db4d6337bd878076c2d20c7923afa690a5f5a5af4be9f3b0c86fa77c3c9e80cfae17e5d963e372239420bd5d8ab67c91fca7163499d2db995e71635e SHA512 351036ff1b7f2a1689308e23a5506c145b98b23a0dbd13c195d19dbc571dde816e2c0e83869e981a9033a1cd2c7191c650131449ba46823b3a2a4c1150de15d7
+EBUILD doit-0.32.0-r1.ebuild 1382 BLAKE2B 35cdaa63fa8da7d22a56b437ce9fcbcb725d19e2c1160c50ec771bc5b9a3e3de1e7307fb9fbba77b82b6bce1f83db4689fee1d7d22847a6d38de048c7e45a2e8 SHA512 0d096d420e41893f03ce6faa3173342cce5842987cca597044f9a76a40095774c15636f34a151932a9768f1309878ac4b0c2797b239a8f18620de92a0b5cd854
+EBUILD doit-0.32.0-r2.ebuild 1385 BLAKE2B 75ed0c32a81356a8a80cb359350da4ac07a9e864806d76782f1f59c1810eb17dcb9e7f3c984d97200c09b8eefd9d4ead6dfb1cfe241a45e2d93418665fcc745c SHA512 50cf8363038366d276dc01a645a1cd027af6e0476c741598db25c824113ff45b796ff47748f090cbd8dc70e7035db3c4e16acb219ecabc23f502421dd9c05da5
MISC metadata.xml 512 BLAKE2B 2d3624f36a7a3919fc3c7afbb459f811234b52f8e83c025d3211c4160c78151616bf1545ea4157dee5742a0267f23879a777b470d4c38746fa512ea3e2decf02 SHA512 52e3181b83ec7fda098ee42d3c61270a32b2170bf48d711d52d277b4448ea1d2672ff8017735cd90ca410fb6996a6547489f873ee20ca35b0246bb6a5a8b82da
diff --git a/dev-python/doit/doit-0.29.0.ebuild b/dev-python/doit/doit-0.29.0.ebuild
deleted file mode 100644
index c4bf8bd37a49..000000000000
--- a/dev-python/doit/doit-0.29.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-inherit eutils distutils-r1
-
-RESTRICT="test" # can't work as it imports nonexistant modules from coverage
-
-DESCRIPTION="Automation tool"
-HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.org/project/doit/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
- dev-python/cloudpickle[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-DEPEND="test? ( ${RDEPEND}
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pyflakes[${PYTHON_USEDEP}]
- dev-python/coverage[${PYTHON_USEDEP}] )
-"
-PDEPEND=">=dev-python/doit-py-0.3.0[${PYTHON_USEDEP}]"
-
-# Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
- # Disable test failing due to impact on PATH run in a sandbox
- sed -e s':test_target:_&:' -i tests/test_cmd_strace.py || die
-
- # Test requires connection to an absent database
- sed -e s':testIgnoreAll:_&:' -i tests/test_cmd_ignore.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_test() {
- local -x TMPDIR="${T}"
- # disable tests where pypy's treatment of some tests' use of a db is incompatible
-
- if [[ "${EPYTHON}" == pypy ]]; then
- sed -e 's:test_remove_all:_&:' -i tests/test_dependency.py || die
- sed -e 's:testForgetAll:_&:' -i tests/test_cmd_forget.py || die
- sed -e 's:test_not_picklable:_&:' \
- -e 's:test_task_not_picklabe_multiprocess:_&:' \
- -i tests/test_runner.py || die
- fi
-
- py.test || die "Tests failed under ${EPYTHON}"
-}
-
-src_install() {
- use doc && HTML_DOCS=( doc/_build/html/. )
-
- distutils-r1_src_install
-}
diff --git a/dev-python/doit/doit-0.32.0-r1.ebuild b/dev-python/doit/doit-0.32.0-r1.ebuild
index d85b3b739da5..0bdfcaf80c3a 100644
--- a/dev-python/doit/doit-0.32.0-r1.ebuild
+++ b/dev-python/doit/doit-0.32.0-r1.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
DEPEND="
test? (
${RDEPEND}
+ $(python_gen_impl_dep sqlite)
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pyflakes[${PYTHON_USEDEP}]
>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
diff --git a/dev-python/doit/doit-0.32.0-r2.ebuild b/dev-python/doit/doit-0.32.0-r2.ebuild
new file mode 100644
index 000000000000..b59594aad9b3
--- /dev/null
+++ b/dev-python/doit/doit-0.32.0-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Automation tool"
+HOMEPAGE="https://pydoit.org/ https://pypi.org/project/doit/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/cloudpickle[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ $(python_gen_impl_dep sqlite)
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pyflakes[${PYTHON_USEDEP}]
+ >=dev-python/pytest-5.4[${PYTHON_USEDEP}]
+ )"
+PDEPEND=">=dev-python/doit-py-0.4.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+
+PATCHES=(
+ "${FILESDIR}/${P}_pytest5.4.patch"
+ "${FILESDIR}/${P}_unpickable.patch"
+)
+
+src_prepare() {
+ default
+ # Replace custom theme with builtin for documentation
+ sed -i -e "s:'press':'sphinx_rtd_theme':" doc/conf.py || die
+ # Disable test failing due to impact on PATH run in a sandbox
+ sed -i -e "s:test_target:_&:" tests/test_cmd_strace.py || die
+}
+
+src_install() {
+ distutils-r1_src_install
+ newbashcomp bash_completion_doit ${PN}
+ insinto /usr/share/zsh/site-functions
+ newins zsh_completion_doit _${PN}
+}
diff --git a/dev-python/doit/doit-0.32.0.ebuild b/dev-python/doit/doit-0.32.0.ebuild
deleted file mode 100644
index 347f0c06dfe8..000000000000
--- a/dev-python/doit/doit-0.32.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Automation tool"
-HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.org/project/doit/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/cloudpickle[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-DEPEND="test? ( ${RDEPEND}
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pyflakes[${PYTHON_USEDEP}]
- dev-python/coverage[${PYTHON_USEDEP}] )
-"
-PDEPEND=">=dev-python/doit-py-0.3.0[${PYTHON_USEDEP}]"
-
-# Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
- # Disable test failing due to impact on PATH run in a sandbox
- sed -e s':test_target:_&:' -i tests/test_cmd_strace.py || die
-
- # Test requires connection to an absent database
- sed -e s':testIgnoreAll:_&:' -i tests/test_cmd_ignore.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_test() {
- local -x TMPDIR="${T}"
- # disable tests where pypy's treatment of some tests' use of a db is incompatible
-
- if [[ "${EPYTHON}" == pypy ]]; then
- sed -e 's:test_remove_all:_&:' -i tests/test_dependency.py || die
- sed -e 's:testForgetAll:_&:' -i tests/test_cmd_forget.py || die
- sed -e 's:test_not_picklable:_&:' \
- -e 's:test_task_not_picklabe_multiprocess:_&:' \
- -i tests/test_runner.py || die
- fi
-
- py.test || die "Tests failed under ${EPYTHON}"
-}
-
-src_install() {
- use doc && HTML_DOCS=( doc/_build/html/. )
-
- distutils-r1_src_install
-}
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index a3ece9fe99a7..19f16f9af365 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -3,5 +3,5 @@ DIST dominate-2.4.0.tar.gz 32810 BLAKE2B 07dcaa1c4c748951e6f1e7e650cc25df7b59a29
DIST dominate-2.5.1.tar.gz 37524 BLAKE2B de210047127db4d078bece1d6c979fcc67897ff2f75ab4b949f03a1ef04832d6e2330063edc022704ad6b28fb6b38930b2e8d837c821ca39a697e1e915789f09 SHA512 85f25a1f2506bcb9ff9cdff699aabe7cfdd4ec690d53624b99642472299cb8b3947ce6f215ff913aa5a80e61d31b92c09f01f03c8f5b04e0d60b92098790953e
EBUILD dominate-2.3.1.ebuild 617 BLAKE2B 7f811036a20b55db44a7f8c667497e7ccb9ff09fb46af7560ed3be77ad501f898279a484a0a8dfb39cab8c335f137b9283dac367c63847b5dea2c7e28db0ff53 SHA512 13e0e88e514f09c7baee97d2129092a3fc96ca068c6275dfc2455bbed9b091cb5e65fac15985cb4e01fcf2310ebc5d2bec556c888b7865d28f2fba078ee7b1e2
EBUILD dominate-2.4.0.ebuild 620 BLAKE2B 225fdb49c6c98f5c3db19ebfd4b9f330aab7ddd2a7b085c301a626869e0f5b77155bc9bc5ce8e54bb9d8c4db3bbb7ad226ca4b06d38924bf1b0fc68563afd4d3 SHA512 18fcb25105ea2394e90128f32df6b37bcb6fed515a3f1b20269d3dff30cd6b1bb0daf989d6cdf0014fde1eb2735559cd835616c2d439366f56f74408a80ec672
-EBUILD dominate-2.5.1.ebuild 444 BLAKE2B 4b140c9d4477b82d3ff6fa1ea0d6118a0c7a9160fd88f102eb45debc1a5e37ac4e220d795de31885ebaaef35fbb52afcc0194615a6267645cab7119cbdfdf4a6 SHA512 c2b97d072cfbe6e6a3c452cb45039e2decdc855550050d09e60f725d3cbd9f5728d80526e92ad77185c5864903e3727d7b07575af468892c8584c8003c527039
-MISC metadata.xml 771 BLAKE2B b57440fdd8bad6140d982af019944cc740ba47183908dc2505c1436448e735cd63f537b3ef2158b6014c4dc050128b13881b368ef9ed5e840b37f7e88ac72a25 SHA512 2af8875459291f59c07ece49ac0edeab74408f54031878c1b03581bdbcfcb509caf37ee30d03e2f86f59dd67aba62c54808ca5a6c67037717113c3bfb6f9961e
+EBUILD dominate-2.5.1.ebuild 442 BLAKE2B 902165607b32b72af55a9a57b772a7d9b44f79d70c10263baa3128268dcc48609a46f817fbcffa902d317f4e9e5e51c8d4e7fc9f8a9f8e74cd39d3e10edf6a52 SHA512 15a8d47ebd4a8fdb66844bd0c486f6664be62af74e1e0f22ab5de5ff01d83b9d6423bbe4106df0f7afca189687a2533a63b9beb356359c0b790d5423292c0c70
+MISC metadata.xml 795 BLAKE2B 042388cbceb8a858b7191ec9284c9523aaaa348db45afd123f61e9e556c2ef35a9b220497848e9dd28b30442086956cdb12937e180ae6164716ae5d13f4beffb SHA512 2079e3bd66c401c4e5750a72fd4d4f772c96c66dbc35b8435f741f574c4c2e93e42dfb28725902a5a2796c770b1e9a6fdb2b950ad397703deb7f9a4a008e53e7
diff --git a/dev-python/dominate/dominate-2.5.1.ebuild b/dev-python/dominate/dominate-2.5.1.ebuild
index 5ad077b8e229..d848b1925956 100644
--- a/dev-python/dominate/dominate-2.5.1.ebuild
+++ b/dev-python/dominate/dominate-2.5.1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
distutils_enable_tests pytest
diff --git a/dev-python/dominate/metadata.xml b/dev-python/dominate/metadata.xml
index 3df54468a06f..1ab70aebdbbb 100644
--- a/dev-python/dominate/metadata.xml
+++ b/dev-python/dominate/metadata.xml
@@ -13,4 +13,5 @@
Dominate is a Python library for creating and manipulating HTML documents using an elegant DOM API. It allows you to write HTML pages in pure Python very concisely, which eliminate the need to learn another template language, and to take advantage of the more powerful features of Python.
+
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 868477a59110..d68d542bac4c 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,5 +1,5 @@
DIST ecdsa-0.14.1.tar.gz 100303 BLAKE2B f7f02bcd99752a7e0c7ac7d22625f5a42638fefb9a92fefda3da279cdbb76d1a5337df5abfd43eb1edccf794c5b2fe34e10df876696d74e921c5ddb35f61f3a5 SHA512 6a66e07ec75e93af73d2363dfd817b35a103f8ff8d62c5ce3af9e98e917d38213aa4f80d570f81c830938123f9599e24d96605a36650eaefd806ed07ab0c14a5
DIST ecdsa-0.15.tar.gz 122119 BLAKE2B ceeb0204b15d75ada1b201321caff2eb28080bbbf5f6436e6cb50203828eb318d9fe8b8343157b59370183d122e47399a3d2cd6ae569b80d81809d7c778639df SHA512 7b7491d1abdb5ca43456d943c96525fa5d722635c496bbddd04ef8e1baad9dc0aef3d1752afea7820f7796421b18295ee260657ec1e8faf7564613b316c0d603
EBUILD ecdsa-0.14.1-r1.ebuild 860 BLAKE2B 854f49a40c07e62f375ddc14c41200f228edffb13439356fc53ff26e66c6da8e6abd113601b14aa1e732b3c2a74d8588a002c50b32515fc8ddf8d37213ec2c85 SHA512 1b540665c294de7ff7304bab7a7e563719846d5c05ae6eb3267dd7d0e3d29b2fd36b2d83140515d29898479cc0819adefa34d19841aaf20cf093a19a36afce5b
-EBUILD ecdsa-0.15.ebuild 941 BLAKE2B bc129008ac3a9ebc66783256f2e32ca4c5ea87b436b642daab5cea01d242e13218aef76299003f022f35823b357a629f9d253b041313b42201b6f0e550b28a19 SHA512 950de255b4994e8e5505a38dea95e44f19eb062db4ee502c3dcbff46a4ad45cf613fe1004b6d9445f6e45e2f67838e9e1c3f097c369af78b11c46354f891b7c4
+EBUILD ecdsa-0.15.ebuild 934 BLAKE2B 4e7ee1b42ece0a8cdcaae48ddda4c8f18c0e48f763c48d9f7b3ce396d43955e4ed998ea869ef75f17f50249c3d47e681bd8f3b7a1a8533a3f56121b5862e1c52 SHA512 8bf9ccf67d04902e24da59894f430e04cc72ff33c8042f72982a7defbcccb07ad9600bda0fa28e88c889d20658d5e97fa9c44a5d8f6b632258c88fd518060623
MISC metadata.xml 404 BLAKE2B ef1491349f83c10a28862359dcac0fabf0cd453c75c1ddcf8598e66782e30917be40798f9816a96f0862f89ea2ecf2f77744cb939da4212a6a9dfb9ffa223a1e SHA512 a609ab61800cb403d82a0e63d5b44e26b8ffcb984ef216ce894aaf3a532fd124ac012a764d1b76b7ea03f3202f736ec3eafea20277b00f99d43e2b6c2e2ce299
diff --git a/dev-python/ecdsa/ecdsa-0.15.ebuild b/dev-python/ecdsa/ecdsa-0.15.ebuild
index b52fc50c087c..3e72b35df6a6 100644
--- a/dev-python/ecdsa/ecdsa-0.15.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index a48af42ff689..0e17780ce79b 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,5 +1,5 @@
AUX eventlet-0.25.1-sparc.patch 4901 BLAKE2B 5c2db6c09e3123c6ec655480e5f440f094071cd2bc1de3260c8443abd736d2cc52115707f0fdcffff3019ca6788287dd8249cdad5f5dad2e449ceb4067e1dfd5 SHA512 cb3f7cd7e8f0cc1c7e040bf8eb04309e98107427ba0b2a8643a18ce13f57803eaee32045e55d2e56cad45fa1dbfb33c99bb4935f153949d08f9240384d9868a2
AUX eventlet-0.25.1-tests.patch 1428 BLAKE2B be4b0e0104473e8434075175a85cb658e7257eea6bb554f92160d308649aa7faee6f4db7d2aa8a3df54e22bf6689d649dec6b74d523425a27bc1a77233b5976e SHA512 a7a413cce99def526ed63b79d1f73d270db9332ac88ff83a830fdc4106ffa20f2e14dfbf8d0dbdd071d39c4d2f161250bd8e7c0681f187fa0736d8184cccd872
DIST eventlet-0.25.1.tar.gz 392719 BLAKE2B 7dbc23e63e9dc8b8bb0b4a53fc07cb467661bd695b6c778b973bd690bd24f3dd0f867d7ed803e1a89ffd36e5597fd244ef2c616c663d3d9130033f5f5928e816 SHA512 936aac45e24b2797cc8b6cd6238d493ce5eb60a47096e13827b8be145bd8dd14503f5ae624485c87b163718a85733b2317688366ef5fdf347f7d367fbf4d521d
-EBUILD eventlet-0.25.1-r1.ebuild 2259 BLAKE2B 05a53f452c2c0d08fdab18d43750ec6d8718896f18e837af928c6684f389f18432f7723455a44fd26ce9df872aef3a8ef173df61008e3514e7844eb5a51cfa58 SHA512 ce73b97f391118733862a2732f282acf0322f7aaaccf1c6e0183161b04615c68746a7b6e35ed44da15ade165eff9326d5f2df8b0e33c1debb8a296753c124475
+EBUILD eventlet-0.25.1-r1.ebuild 2256 BLAKE2B 36925c93bda12c2a27da19baf7bdb9243743cd7eb2ee5580063093d4dcd8e0baa3e4a2056bc2ab3bc7575a33cdfee4d4025508061ab873651ffab64ac1d601db SHA512 84018c3898eee90daeac46282d66a4842a2a764cddd64edd4216dc2f99415a4746ca8b36e6c6c3bd293ac96a90a7e894f8f3657c3b0ecf5c2e30558535d28c29
MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
index f5ec914ba9c1..e12c4ff72718 100644
--- a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~sparc x86"
IUSE="doc examples test"
RDEPEND="
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index 972a60b300c6..8c2d34ce465e 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,5 +1,5 @@
DIST fasteners-0.14.1.tar.gz 17749 BLAKE2B a1367257b495197f974712a3444d4d7f02bff2e919ecd649aac5d0fd946c128dc7592afaed4ae5044324af5d8c63fcbca6bf56eecf04e2f521dfbaceae8bbe16 SHA512 a58c5f1658b1bc664c825f2237fa91b72b9f31590e7eb79c7ae7a86c507ebe84574ac7d8e837a7bec11ad32f04204ef6f5906219b00a6adb0732daee1eb6faa1
DIST fasteners-0.15.tar.gz 17898 BLAKE2B 58da6de627024f6b50d2f35caddfa126ee5d45ea89e16c5f14f7c42fa72e47ca9f98e1f46806b6f5e06401b25132e89113043806db1b13c2d0a095a09aa9aa69 SHA512 756f2ee8aa82ec6fd548d6e4320123b7c0bede834d4e58ff9031e004a8d9d0c23f7df4026ec4195799baa459720ca02d69a981a4aae54713e190a71152f2df9b
EBUILD fasteners-0.14.1-r1.ebuild 810 BLAKE2B 1ba1b170aad7567ba7fdc46318ae61452b582b3633630bb63210e75a901a60bb823ac8f3e520a6896b3a845d1577691e4a45b6e87f8bb03e662c02bcfdfb1dd0 SHA512 00182fecc8114506318d019331e5ea4237c94703185a0fe6c24af5514e7e26712d433ced7ecc7b171d0111381c458a351da9b159c2c7ea0cf5f6d6b72fd7cabd
-EBUILD fasteners-0.15.ebuild 606 BLAKE2B dbe9cd49b61479efc3a26af799d788a59eaef062ceac2283ada4c4020da6bc99733c404cb49f5b3b05c88a39f1904e492d5b86469d812de933ab6a53ad592192 SHA512 3dcf27fbdda12d4c21ca9b48ac46055ab28516cd387cdaf3ec367a35458abe361e581c3e3b2c9195bcc0a8a993a9679746aa987b856d76d5fafb075c7bad4d26
-MISC metadata.xml 485 BLAKE2B c55221455d7ed96021259cb5f3d6a5d13df207d21789484da848fb545ea719e9406e2ae61da2f5a46af82a620a6b8af7ce7f0431c55692fc7b9e6f8c8dad908a SHA512 f7c4c0751a096b3ec92a802b4a22864a542758d12e8105ac13c2758fea1952eabcb3ce9036e5aa170c865b7f89ed0b0891e9d88eab5c2812141575ad8ffe8df8
+EBUILD fasteners-0.15.ebuild 603 BLAKE2B a6ab8687f84f7309d283e85407189563e843c2539e5da1bcf675357c0a6b693f39775dc0294b80344a6f0dbe4ebfe13f153425c43777fd1f7bb84605f2ea2ae4 SHA512 7bc8f19e619e16baadc1ffadf3fb0d92d50307b8a677e452fa980d6245ffdeeeedd23098bf5da49dabec65b89534e41b0b87f71766469c16cd919ae377f9cacf
+MISC metadata.xml 509 BLAKE2B a2ecd43c854cb670cc29c9bb6e663a46d33334f3e2ff45963730712eac8eb7b9059445dc798a73f89eb2c9e66c5de1caf9b6f4193df5c0552e8176355a325e0e SHA512 f72b52a24f4693ba6d534aecf039a616be7bd5efc83dcc76c8eebaef95edd247192c784caa7b001224786071e5dd3dec59758be0717330a71c4afb7718bc68b1
diff --git a/dev-python/fasteners/fasteners-0.15.ebuild b/dev-python/fasteners/fasteners-0.15.ebuild
index b66f8cbdd58f..3237207f37fa 100644
--- a/dev-python/fasteners/fasteners-0.15.ebuild
+++ b/dev-python/fasteners/fasteners-0.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/monotonic-0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/fasteners/metadata.xml b/dev-python/fasteners/metadata.xml
index 80ab359f0e1d..3e8fe2e7a5fa 100644
--- a/dev-python/fasteners/metadata.xml
+++ b/dev-python/fasteners/metadata.xml
@@ -9,6 +9,7 @@
python@gentoo.org
Python
+
fasteners
harlowja/fasteners
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index 54ab8e263f34..98a8623a5c38 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,5 +1,5 @@
DIST fido2-0.7.3.tar.gz 188262 BLAKE2B c1d832229ce741be3b81e4cded65b77e57c008aaba8ccbdf640bae1c27f4d86f2c0ce7ffc83405e3693646a8f2868030619c958ecbaa58a6a6328ece2cf6d3de SHA512 715779ecc9dba19de0e45df13d018e7dd223f20f5662860874aa8aa6f811c1df71c07656d21b49a4b6f14a149134d8af6bac076a7f71cb7392ca2fef70b173e1
DIST fido2-0.8.1.tar.gz 201198 BLAKE2B 33411dd05d7f513445afa8a6fc4bb90f3989a655fa05d2ba9da411aa7eea3b30ffa253fae6586f76c416115e5bec90f6f120472a49a0acfbd91020d2cba8f74d SHA512 fc0753ea694f2170d529129764cd9f9c5439cd2f467e4f384d7a698266ee8391a5c9c7c6e51d2dc2a99b93fca1c7d5288d5236e302672a87b8ca7704f328c0b5
EBUILD fido2-0.7.3.ebuild 1065 BLAKE2B b71ccee7a4731d15ad77d9bf1980376cdd37c093fcd52d632fdc08a19fedd4252f2d497661222ce2463a49322d6b9cbfdc71d7b536bcccf7c1a9af91bf33fd22 SHA512 debe2b7dd2eb0d6c4675fb1532dd5aaf79562d8a285e330dbc2440eb38b86940a54da440767a0a1c989dc490a6ddcb4412927a8cd9be23008733727dfc61831b
-EBUILD fido2-0.8.1.ebuild 1067 BLAKE2B e385742ae0c672ef0c5e0311cfe6ef61adebb58fe227d5400d4f8ebe840b5c4e0f7287e92d8f8de974a32fe3df03a48100affaf8277652f50cb78a245971d81f SHA512 2724ffed29a73c25036c0a2702090524edbaee8e7dbc2e9225586c84d6d38462d50ea6781073682ad32e210784f00f3dcaaf6af908eb07d4e3e6f018aa3002c8
-MISC metadata.xml 516 BLAKE2B c8d1710daa727f863e8936fcd4d2374c174ba6f1224d7c66d498bd9353e165b5659d3239d730bf406cd18adaf0acbe1446ebd3d2e3d0baf4fe28e512ac70fea6 SHA512 18f926acaf096999fb70f2942e81ff76effd0f769defbc975653992282ede547c2403df64937edb4d183dc3e218c0183ceb39f343349502f6ff9052db1446090
+EBUILD fido2-0.8.1.ebuild 1065 BLAKE2B b71ccee7a4731d15ad77d9bf1980376cdd37c093fcd52d632fdc08a19fedd4252f2d497661222ce2463a49322d6b9cbfdc71d7b536bcccf7c1a9af91bf33fd22 SHA512 debe2b7dd2eb0d6c4675fb1532dd5aaf79562d8a285e330dbc2440eb38b86940a54da440767a0a1c989dc490a6ddcb4412927a8cd9be23008733727dfc61831b
+MISC metadata.xml 539 BLAKE2B 3e4288bcfbeb472b34ae14848e5dfdf24eeb8ff819efdd14a888a50d0eaa1e5efb6854a9c5cdc1c4e998b7483cfae673f83d11c98f8f97db561af50a0a908ac1 SHA512 6868804b1d3118b99dc77a1f204c05487462eee4fd1458ef9f722fc1b9038b3d4cb7a8436246b115343d53616e466e1b33fd97ca7adbca9e8cbffcfa95480354
diff --git a/dev-python/fido2/fido2-0.8.1.ebuild b/dev-python/fido2/fido2-0.8.1.ebuild
index 84a0ac3d31f2..d59bb437ce44 100644
--- a/dev-python/fido2/fido2-0.8.1.ebuild
+++ b/dev-python/fido2/fido2-0.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar
LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/fido2/metadata.xml b/dev-python/fido2/metadata.xml
index b0754694d806..c9ccdc3b158b 100644
--- a/dev-python/fido2/metadata.xml
+++ b/dev-python/fido2/metadata.xml
@@ -10,6 +10,7 @@
device over USB as well as verifying attestation and assertion
signatures.
+
Yubico/python-fido2
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 10e21942e762..39cf70a05313 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,5 +1,5 @@
DIST flake8-3.7.9.tar.gz 150123 BLAKE2B fd46710c0dcce7d3dcb3d5fc8ff7a83a35315679fa838e68abafd5bdc342c13218706fec0dac3fc9a6d919971f1f846c855f00cbd60c925e979378e431dace0b SHA512 c3c753ad050d8a8f87f7c28c8a1c953ed9bd04f08b09512d9323152b4eebb57d67fbfb0f5317d629174fa12fa234e1a86d6a633dd951fff6a45330b1c4f62850
DIST flake8-3.8.1.tar.gz 157166 BLAKE2B cc8b2dc11f78a6b9c62662086cc190a29a0a4e5a228d4823de8e2f3f327cea3e5df4db220faf9cc14fa34e3825b7d1e4fc4ccf9d1205b437903f327f3ebfa7bb SHA512 f73a306be7d8e5bc48dd9d6d8f8cdee07a90c6c38ee7bd37a21f4be23f1812e4a1e214cc75ca1a324f40e750312b5d7ed573ff49d673f9a1f33aad188b108add
EBUILD flake8-3.7.9.ebuild 1495 BLAKE2B 8fcfacec08f8e6cb746a0359afa8d2070475d0b22c4c080668c7405069c8672201a39d663d4eb5e7f9c7a8364aea956751f6eabacf56fdc6e179b038dfcd192f SHA512 3b3a06492aa3cea6f5f3fe1f4fee897f1b478d77e4480ff4c7bcae630f965098622b0f39c7507fbf5c399900fec1e0197ffad961032aca4dbcf52d6230e32ddf
-EBUILD flake8-3.8.1.ebuild 1372 BLAKE2B 5b0a2618a541ed70b9621fe31118c9ac6d62e82ac15ca006936766ac395ee05b7319aa2d547ed84ee16ee1b7bc3822e91e3966e05ae350a69f7b765dff17a97c SHA512 861119407bfe224edbbda3a153b24e60890320ff88d3130b9a05a4b6fbbe85b19519763f544babbe1ba1dd5c4edee6553e10e8641ebf2af06b08fcd51140f484
-MISC metadata.xml 373 BLAKE2B af4d7678c87281f631048d3c49b0a642ceee1d771be2b662458888659b7c8e262c98adcd7bcb7f6ab251783998950725729ed35c887c004f8d8da87da81eda7d SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646
+EBUILD flake8-3.8.1.ebuild 1364 BLAKE2B 8651003451f61560099bd80e69436ef65127c5fd55764c421fb09e56655b2a78984ceb113461fe433656a6287c95f426e67f441aa9d30f6a0e7e258067f98073 SHA512 ac5870d46dedc040bc3c42e468bfc75909ffd7987f463ecfb8f9eb2daa567e4e481f526f3779b465adab19cf26c8563c739cec797b961d76ba68a1ce3cd6cecd
+MISC metadata.xml 398 BLAKE2B 5a71d80adb94073494d12eb93722d21593a388b4f4cb47ad8ce1e8d053f24d1597c36743e720dabbc023f9318039b45b0b1ddc22d86455394b72789ab0c5e988 SHA512 823dbd0877b3ac042e5c51f260cb0f3d3490383a4975d7bf2267898cad7e3366a693be270d2eb9c8dcea8b7f66d1e6a3343b7a4be5c1b8f0fff8ffe514952e5a
diff --git a/dev-python/flake8/flake8-3.8.1.ebuild b/dev-python/flake8/flake8-3.8.1.ebuild
index 806a6b8f6385..a78e17486415 100644
--- a/dev-python/flake8/flake8-3.8.1.ebuild
+++ b/dev-python/flake8/flake8-3.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
# requires.txt inc. mccabe however that creates a circular dep
RDEPEND="
diff --git a/dev-python/flake8/metadata.xml b/dev-python/flake8/metadata.xml
index ef6942e1e79d..86d293288a31 100644
--- a/dev-python/flake8/metadata.xml
+++ b/dev-python/flake8/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
flake8
pycqa/flake8
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
index 1b5527f8b49e..fb8c1282f250 100644
--- a/dev-python/flaky/Manifest
+++ b/dev-python/flaky/Manifest
@@ -1,3 +1,5 @@
DIST flaky-3.6.1.tar.gz 29501 BLAKE2B 57d8c1ed9f271688f8a6f2acf25456058b3a67c86ea7aac8c32fd52221d294b5226461b9260677e3ed94af84ff9993a02e79f0d6b01f05daee2992efd8ad03b8 SHA512 f14fbd9259759f3b6f18a7dc16e00717ce54392a10cd9b3225636e33c904e69c6b01398bfce96d7273a40b6c2cca897a05ad386a4d8a83bffee12fab322f9b32
+DIST flaky-3.7.0.tar.gz 29591 BLAKE2B 747fbda71055bba937abf3e7b97691c1f4b222f085069d1815d5a9eba669464d2ed5d6dcf1842ae82f1970de5cd5e3aea5b12476bfa2d9282549ad0cc62901e9 SHA512 b399f6e1323d6ca341803ac6f1eb318bf24dc37182d0b49b89bb81b9466dd36271ad6dbb9f48ea6fa4760ee631f1482bb6f49c64f4d4520c40634089c1b64f9a
EBUILD flaky-3.6.1.ebuild 1277 BLAKE2B bd89281a3810254e08e56744046a9ef6380d8c339ca0c7e15292f157251653ceb5722354b0851e1b5c9cbe05c4c9d168fc5a396183861e969e0cc171dfe8ac0d SHA512 39005d51822b0ed1d0c9568197e4d6eee774b47e6c8ea8aec34ab7f899c7130a14d3cbb422ee2f3180b21be4280df749cc7f7c90a3be8feda7edd465a744460f
+EBUILD flaky-3.7.0.ebuild 1286 BLAKE2B cbbcd94899a975bf694ea731f73be9b74dae620f26b60c869fbe1d98ff10c42e361b1582983b92ad4b3faef4a37ca75a4e68add7c60dc7fed0beacfa21f2f4ef SHA512 b11146c9ad64f132c2ba9fa4f8d48475da2e7f885f699a2c329dba0a1356d525876e109d4a3da3c30a6cc61e052a4125e25ffdbe2e7f3aaa3d88288fc891690d
MISC metadata.xml 369 BLAKE2B ffa607acfbc98fc2e539492f87b55cedb039b39b3cdb7ce07cf9dcebe1a1559296284b27d06fc6262f362c0ea8577e23f4bef07ffd01a94c4d981fa060384d5a SHA512 da1597d14b2e3f9bc56e48064718a2a52bc1615d982d679d8c971f1fb1b9c25169d5412f99542f808fa42f958e1bb589e7615a13077a7d1b0574acbec1d4b1dd
diff --git a/dev-python/flaky/flaky-3.7.0.ebuild b/dev-python/flaky/flaky-3.7.0.ebuild
new file mode 100644
index 000000000000..98443c6754cf
--- /dev/null
+++ b/dev-python/flaky/flaky-3.7.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
+HOMEPAGE="https://pypi.org/project/flaky/ https://github.com/box/flaky"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ test? (
+ dev-python/genty[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
+"
+python_test() {
+ nosetests --with-flaky --exclude="test_nose_options_example" test/test_nose/ || die
+ pytest -k 'example and not options' --doctest-modules test/test_pytest/ || die
+ pytest -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py || die
+ nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose/test_nose_options_example.py || die
+ pytest --force-flaky --max-runs 2 test/test_pytest/test_pytest_options_example.py || die
+}
diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
index 9ddb7fd3acc9..f44dbb683c64 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,5 +1,5 @@
DIST Flask-Babel-0.12.2.tar.gz 44567 BLAKE2B a164dd527595412c451ee7bd772c8579f76d0202df3e1cb4c4952dab4aa4225001f5fa35938e72892a6452da1a9b70b2fd661249b2f37953fe3963046631d384 SHA512 c43bf5cf6c66e3a8a52298f52bd6300cf0b0c53a1f0fb5862b1bcf8a9800ea0e043c9f85125bb9eb5c281a3c0583c63f0f9653792204883a6f82080547b37104
DIST Flask-Babel-1.0.0.tar.gz 49680 BLAKE2B 29adeb7b4a6892fabf6e85da9f2fdb72f3871e3c3728c7521e06ffd80d8da505045eb1ef7a30223d8ef40064bc78514f6fc9acd1b8640232adb203ea55876e93 SHA512 3624b2e4877821551267e2719d76b714bda0a1da24e5a3c36d045273039823c4f3bbdf28cad5d8e0d4f0c896578248bfc40aebee720b543e500edf6de607ad8d
EBUILD flask-babel-0.12.2.ebuild 1219 BLAKE2B 2a79a0d93377e862f9ead3fd702f789d940bd26522e3f8155843d289b00d1d4995ce26b3fc2d1825332125ac70b85ab2beb85a0765e8f9a41aa993468c08781b SHA512 e24f0e41a70cc1e98616d2a149f3cb247f0beff65fa8dd0df5e67d2534ccfc12f2d41d39a13c5b544bf8e36073124c63d92b305c6f514312c516d117f964b16d
-EBUILD flask-babel-1.0.0.ebuild 950 BLAKE2B 4cc5104320e13c622cec76e155649f19c1a52f7cc45e6e79e1c4d12ae720e84ddab1f3ad8de4782cf58cbe8a30373d90f8087ac980073c69f4daa3beab7a0387 SHA512 2eedf1ba14d5916c6f406ba9dc6aeaa2ed93254847c5bfd68bfa1de7acc4c70a5f677f1929d8cf58d863bb853a48209f984ce661bc961cd5bba3eb14055f5592
-MISC metadata.xml 450 BLAKE2B db38ca56f4b683429248baf7411355305672c23126c4b6c7486971fb1e099bb3117b9246870a24f6ecd66e7f27647e80285461d046c02e9227970a111c58dd98 SHA512 d6fb2f7cdf0a8d4b54dce372bbb3d9728a5ebb0e6d714da9c58e5215d6711e3f4211e2a6ef5390cdfa663d375d7e2942a210bfa2822489dd04a911d9e9c24985
+EBUILD flask-babel-1.0.0.ebuild 947 BLAKE2B 830deb1ecc673a4609257766ac430a048d4850ba64f67330785a8e96b405839c14b47052f8a5dfb355c95c1f0637b6a365d3cc81fca9a50e83d37bfcad07c4ce SHA512 877d3a3a50810465f059ab832916405b580c244b79e12c42e4879f9ee6f11232750cda2e251e2488e172fb8be5c1510f7d237627c000b17529770f487b6bb328
+MISC metadata.xml 474 BLAKE2B 36e79f81c6890109b98f7ab2da037e18fd85cc34f1cbf6f8ecaac683284b3385fa15848922d725feb08a063100005dc2d159066d8ff37199cfc5778474d6e442 SHA512 a1f2ada6b9ddd886fa70b3d79c6afd3c066dff22ffb7bcf8ad8b8e02353a0910b96c25c8320879e5f3c137c41bb52d7c4249cb3fe486f13336e725f98df25f2f
diff --git a/dev-python/flask-babel/flask-babel-1.0.0.ebuild b/dev-python/flask-babel/flask-babel-1.0.0.ebuild
index 59c7c7d3d1ac..3ad5aeec4a4f 100644
--- a/dev-python/flask-babel/flask-babel-1.0.0.ebuild
+++ b/dev-python/flask-babel/flask-babel-1.0.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
RDEPEND="
dev-python/Babel[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-babel/metadata.xml b/dev-python/flask-babel/metadata.xml
index ee71c5b56de2..ae0c3e4cd576 100644
--- a/dev-python/flask-babel/metadata.xml
+++ b/dev-python/flask-babel/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
Flask-Babel
python-babel/flask-babel
diff --git a/dev-python/flask-babelex/Manifest b/dev-python/flask-babelex/Manifest
index 56f028007d2e..d6f182f998ac 100644
--- a/dev-python/flask-babelex/Manifest
+++ b/dev-python/flask-babelex/Manifest
@@ -2,5 +2,5 @@ AUX flask-babelex-0.9.3-tests-fix.patch 1508 BLAKE2B 828c0932722c4a052e8360338a2
DIST Flask-BabelEx-0.9.3.tar.gz 41040 BLAKE2B 010f8a7be2d59db143010456673a34e2a42f8978cf000d844f11d27969f120c0768038271b8c62b4f6965a3a60f9c845c4027daf26459fce1489482cad0f8856 SHA512 c759f990c4c96dab7cf2fbe83c1ac6dde4606adfd2f5d03ed293578bec621170be319b71fc3e38c1910d2edaba3e4394f32ede3754940e315abd917beaf3982c
DIST Flask-BabelEx-0.9.4.tar.gz 43423 BLAKE2B 9aa6223cd29cd1ce3de0d8c8b771980457fa0ee76b7fd361b9b6d8ae79f521b36096b4d912281b7fe671655ac8c7b04032c68fcc59463c5630af073f264f5815 SHA512 0deec4b481876f4c76cde398157cd2bdc564e9d1076a7accf1720be86b41912466435412ad5f7e5e8b06f17ad5363ea503191b159b30625d067e76a45eaba957
EBUILD flask-babelex-0.9.3.ebuild 1153 BLAKE2B fe7bbcecc3230f07262c3b04b5e73db6081723d47f8ab9a9c21762afdbe0e31a080878e812bf2f9805362047f97b7445412e2bffa72fd3608cb02214684265d7 SHA512 1f50e8322e1e8bb680e7ae8f7825b7a29ca239575e4b9b5e9d1ae6ceef1af61a16b9062ddb1d326c3d27a4c288cecdbb3fa243fe9fe476b49ca28c8f2b0b5251
-EBUILD flask-babelex-0.9.4.ebuild 958 BLAKE2B 9384812ec3c5e2614f144d3404fabdafb5ec48838f5626f2bada47a8a440a522ab4a7d4b018201d0f776a637a0d8b6ce0141079b0a6546ad0578747ee1a45688 SHA512 b3603509ac26afaaa703bd7de646991982b8051afa48e7a2373bd37dd518ec07e4260a26e2de266135e0eb453767a0b7cdcd59e803ae3e1793b6286fd4cdcf54
-MISC metadata.xml 388 BLAKE2B c961ae85719f00427bb3c616873c4cfbb3d928d1acfdbdedc2abcc3fcff8d0ef4d406dccedcb18748c99b094735ca9dd8f42df755ba6fc3155f229202e13ab36 SHA512 844d8f6784fdeb00484620a822f16256cbb7f07b9c0da936a3cc1b158219839612439e8158b30c4b4c713a88b70edf64068e1091ed102f7b5ecac17b1ef53ed0
+EBUILD flask-babelex-0.9.4.ebuild 956 BLAKE2B 3a1bd444f3fd40bf15908ec3344d2b566df9cf1210bfe8178bdb23cf74707e5c57e5e988b260aa582e561aae756e1268b6e906c41af8527090075d73bbaa9c92 SHA512 529c347da6f6f5086bfdbaf7424ffae4a4e2a7e0152823ea43313320b1898f74dea12024b51f37fb9b3622cdf0605bf1b50c588a22880ec4baacaf5779e6abe0
+MISC metadata.xml 413 BLAKE2B eef637e58f0b117400dc66a32777b299aaeca4d3c518660e02e71ec002e1f14ff03e2c84632aa1bb0fa8d22e7fa2f3f83dfd79be154ac1dcf9f5067c80d34280 SHA512 6a99b26c0b81ec377ddf9c0ba09479883a6e12b8141c0e2f8a20a916a7b0a80340a5e025c25e9b607df5d255f632a1c6b52fb0eee5d80024367fe0dae3d5cba8
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
index b24481782f87..d0dcd208477f 100644
--- a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
+++ b/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/flask-babelex/metadata.xml b/dev-python/flask-babelex/metadata.xml
index ad8b7279ec7a..0f8e16df446a 100644
--- a/dev-python/flask-babelex/metadata.xml
+++ b/dev-python/flask-babelex/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
Flask-BabelEx
mrjoes/flask-babelex
diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
index 207e4d63cdeb..d8b31eed37eb 100644
--- a/dev-python/flask-restful/Manifest
+++ b/dev-python/flask-restful/Manifest
@@ -2,5 +2,5 @@ AUX flask-restful-0.3.8-werkzeug.patch 1517 BLAKE2B fa895690ca771f1b4431c62baec0
DIST flask-restful-0.3.7.tar.gz 114238 BLAKE2B ec960f060b3a1a36e538606d710a57e9d9fb3b1c2c1ee1874c5f7592e9ad8a9a2af4716f820f27ec1a9e55fcb0505ca711c6e045e6cb0ef8c9c64de339871710 SHA512 1d1d066dec5f39af3197b680f791d83df686602b703efe874ea0e81d7f3b65f605dbdb63f84fdd07e469c6824d52571e195ae70f58e1543b53f13a81e1cd8543
DIST flask-restful-0.3.8.tar.gz 114588 BLAKE2B a18eac613300102bb5a5ca78cea1e6f81f3de21d8bd2e6c72f2f1a559e8b4228175cc7d372b68f131267cd8bc759e354e5782e527d1e992579210348cd2b78dd SHA512 15172114fcedc2f4286cf5f583d95e42c8c8ce6553f9a44e57124f2b1417bf9f094dcb5154a6933ebebc8022f39d4d7969d29d38576111f9d5b45f630b36a66c
EBUILD flask-restful-0.3.7.ebuild 1201 BLAKE2B 4c1841cd167a50a4acf19023f59b1b9a808fe18c22fda015d51bb340db9492a905a782ac954437f43ad5510df3c538d7f3e3df9f11b679001c58d6dcc5d8dbe5 SHA512 14f52af657fc042315252fced1d376b1979900d6cf07eee517fbc0165e21b1a69000ae8826fc256e837016231adb08a7851d2b3afbc4a8fee2595acf3654c1a2
-EBUILD flask-restful-0.3.8.ebuild 989 BLAKE2B 200ddfa40bae21a02d360b20f0aa851352b93d4a9227adfae3e6397a58ab44af6aaeae2c6b5e7477cc41a3e5581ea02cc3d0155197ea392862a8eacd3e35c8a8 SHA512 46c585428e84aed32e856632fdae0b94295c5d3211e4d191ed43b122023e96c340d91d11f85973c19717fefdce782370e241c4f1faffefea1658555a14e8fe28
-MISC metadata.xml 325 BLAKE2B 9c13e94c78d9f908263c1d775ca99b1425388b1fa75ab8a643c08ab1097338a6bf61d09a4a2518b896c44cb4f8b0d2ed5825f7e8b8ab70d53693a07e055f2c34 SHA512 4571c1bc5e8a1a103b024bc97538c1daab53f84fda86af428d9434365f6c3ceb43b5fd2ffa24abfb095ac1cea865f571d933472c0a6648899069b187b923e5c4
+EBUILD flask-restful-0.3.8.ebuild 987 BLAKE2B 620c70d1318b4e55da6bfaf171b51055c2d2df5d2099ee6a1fead872cfacbb9a00698a04377bea80db7bc4b92a488ace537b5536f6054394cc638543b0ffa91a SHA512 14d732daf0ce2119811b30e1dfacc0e4bb65f78759bd325eea30a692793c29932674aaccdabbf13cf4774f8474a4d7d658d539a67e3ae4675fe2c9142f6075e1
+MISC metadata.xml 349 BLAKE2B ca6c5de3fcfddca1b3e6766ffa3dc82294b24cc533842dfc31d05a64f6b3949ac928e72d9e9d53493f2fa8e0b79875196a7c37e13e82df3a965a44572854bd9f SHA512 f2fd44852255396e94d2e1c61b1f47a7e87d51cbe7d5a3f0451020daacb69cf4f5de6620d092470537f3693d9dd816d597c4ecd8fb80bfb9e7a71d9bb49c4a9f
diff --git a/dev-python/flask-restful/flask-restful-0.3.8.ebuild b/dev-python/flask-restful/flask-restful-0.3.8.ebuild
index 6c63dc0f5957..f991e3e9ba38 100644
--- a/dev-python/flask-restful/flask-restful-0.3.8.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.3.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/twilio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="examples"
RDEPEND="
diff --git a/dev-python/flask-restful/metadata.xml b/dev-python/flask-restful/metadata.xml
index 51b801a00632..ee91a7f4854b 100644
--- a/dev-python/flask-restful/metadata.xml
+++ b/dev-python/flask-restful/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
twilio/flask-restful
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index 6adac3a01238..56376a7e16f8 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,5 +1,5 @@
DIST Flask-WTF-0.14.2.tar.gz 254903 BLAKE2B dd6b650d97622dbb56cc0bdd3c036f14e562181720ede0c48652b8fcbc88d2d684f013f0468e723b8b0746f2c6f44ca18ffe0ea353594680b47bc1212664ce52 SHA512 9d4b4b24eb24827aeb524699e6720eab384c42901a102daddd9fdc6b8dbc8eebec8c9d31a1e9052c9af4d61bd08eef8ef9dc4cdc8d9b950ff5bdd0201db1dfde
DIST Flask-WTF-0.14.3.tar.gz 44507 BLAKE2B d160e10b1434c0578708c265468b77624953eb2d4ddde9a6ed2ff5b4f4651e0d5d2483020f51c9e512e3cb04895ecaa8fd1d0bf9380211d0a916acd8428f353a SHA512 58bdb87e442dd49dcbc9090e6466ecbd0b5c6bd2f097a26e071a5c73e09256ac46cc2f794f138f0e0b45e4f65ce70c231c275dc69aa44df408d7d79b15198832
EBUILD flask-wtf-0.14.2-r1.ebuild 1375 BLAKE2B 413fd63e30135c2febc89379f662c314c7ffcce9cc3a1013ad07fd90a4088626bcc8b5717296e1b81bff0e14104ace4a6ebfb36be5c59d825b8df7230e8540d0 SHA512 ae65bf4d5f17491a29edc19f8688b26b489d2d239d4a808ce0c545f069c47294469b78ef9c8a1cab5fe5676c8c9f49df19f8190707aa50567ee1318b5f1f214d
-EBUILD flask-wtf-0.14.3.ebuild 1028 BLAKE2B 532cc5f12253ccecf24b2264af19416fd755a778e4cfa075e8160ca455fed54b5d6b5b140cfef33b51c8177a609eb8faf789be13d77de7590166dd1765a85470 SHA512 08e5d6b395079edc51a93c3b09a370576f59b5166b4e409dc5027c59e8330e9e3c41873d11300c63ea131ea329b0e38a4aa19227a76028cd10ec7af9e0f9fc65
-MISC metadata.xml 476 BLAKE2B 1f03a8124103425d2987148f9d83bdf1171b343c2025ad453504a020a3271801368aa2ef510c00f1779813336cd56955b40a0225d139bf82d74eb9fa8da8016b SHA512 5e4d7655da5bc99c41c4eab7f182ecc6d24626fad8bf74bc9baf47e6c9f6c692bc3e69f717fb4d7a149c5b097934d13064843a2846988dcb746fb8696257ac61
+EBUILD flask-wtf-0.14.3.ebuild 1030 BLAKE2B 551477d7002cd792e46c5a3624e9f3ab8d3c57256db9cc721d64603fc0005cc246d40476cc585c0330d7f40ce504ce6a2ef35c80746042c301fbb6985004c33a SHA512 b7bbdf585acb1e8cb7408d662af40559bd1a6be931a87bf3217920a92211edc0412015c898f7bb7fd8a06adfa8692b8ba75468aa23ed6d54dba87e618273a365
+MISC metadata.xml 503 BLAKE2B 140d26af9657500e359d1d40308d83123de20d83b3536dd283d9692062b9dfb044801a3b099a7db74bc8df437049113d7e0ddd55d60b0bc1b46fb0fec53ee2c9 SHA512 ca4b90e216f28bfc736d5c617244d79c27b41564ecc33ad3f2d4bf2837bd478707ce7c08c01ac6579c839797686a94e748d725a594c7e7555352e93eaefe0c98
diff --git a/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild b/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
index 49e218201e0f..c9b1f2fa5be6 100644
--- a/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
@@ -16,12 +16,12 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
RDEPEND="
- dev-python/Babel[${PYTHON_USEDEP}]
+ >=dev-python/Babel-1[${PYTHON_USEDEP}]
dev-python/flask[${PYTHON_USEDEP}]
dev-python/flask-babel[${PYTHON_USEDEP}]
dev-python/itsdangerous[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-wtf/metadata.xml b/dev-python/flask-wtf/metadata.xml
index 5606288a2626..0d1a899e6b32 100644
--- a/dev-python/flask-wtf/metadata.xml
+++ b/dev-python/flask-wtf/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
Flask-WTF
lepture/flask-wtf
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 33d765f1aac8..d09e9188c758 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,3 +1,3 @@
DIST filesystem_spec-0.7.4.tar.gz 222128 BLAKE2B b111b8194e2c31065a26dcd952aaadf0bc39bf75e94b10f79a387dc1b66838de820bcdcd90af60533dbbd33cfcc275470ccd82b98d0c82154f0633efab355187 SHA512 086e7e7905ff4a55b7027d2b005fd875200bf40469ea4b36effb9805a3416145ba4c709c4a6c8a3ac24a033cbd2104e7ebe401e2610db6c2d8548a63587b343a
-EBUILD fsspec-0.7.4.ebuild 765 BLAKE2B 69e90a6fd05c3f5fabc7b5e057f3e8130ac1d43f1ed2db2cab93a9f5da229eeb675c07e85fec1844759b792d638652ea7c339adbb396ed3bf03f8cb895095312 SHA512 26e97bd2793966d8ad26fa1f257d7502ffcf155b4ee54f157407e27218c142caca2f005cce54a979c2eb06e041a4c6ae1b8e2d179aca76857d8f0b9be529cc1d
+EBUILD fsspec-0.7.4.ebuild 805 BLAKE2B a52ba3be3cd0adb632e5fc992b399d256bab2b2f64f638b3d87f41b4bb2a4b2c8594dd0ee4aea357c17d7806b5e5eb108e429352c2f8b8c5df6502d99e587183 SHA512 203299b7525e670fa20cfcfdb5467e37e66c089a7d8bca7308c64fb827efb6be2d8b9ea9aa23e7d362922a547b9ddbc70157ba88508277d7156eab76d964b9e5
MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/fsspec/fsspec-0.7.4.ebuild b/dev-python/fsspec/fsspec-0.7.4.ebuild
index 29d487b579e2..f02a30279fc0 100644
--- a/dev-python/fsspec/fsspec-0.7.4.ebuild
+++ b/dev-python/fsspec/fsspec-0.7.4.ebuild
@@ -22,7 +22,10 @@ KEYWORDS="amd64 ~x86"
BDEPEND="
dev-python/versioneer[${PYTHON_USEDEP}]
- test? ( dev-vcs/git )"
+ test? (
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
distutils_enable_tests pytest
diff --git a/dev-python/funcy/Manifest b/dev-python/funcy/Manifest
index 96fedd00e608..c3f976c53464 100644
--- a/dev-python/funcy/Manifest
+++ b/dev-python/funcy/Manifest
@@ -1,5 +1,5 @@
DIST funcy-1.10.1.tar.gz 29657 BLAKE2B fb2de795a5564f7009ff5717b8eadc3cb24a2cd4c30b9b9627861d7c8bcffdc1ea27f480c2895b8733f6dd965fbf9ee0fd7f12f8bbd3cf5f0d291829bc852f4b SHA512 123a5a828bd3cdbd38926923eb3979c4e5bca246da93179321eb1619df22cf6f722b5971d1309a1bdee2eeb362fc7fa85c6769a60efdd668350bf6c7d95e184c
DIST funcy-1.14.tar.gz 548493 BLAKE2B fff352d0e0d685fb51fb30302542c2e8893209df1e01912efae06821fbc885b05ab3fea8786d6924b48ddf32cc6bdd6def5e90db1ff949b005437b5d3771c3c0 SHA512 0c7daf1a6d87f56663ae0d37cc65654c79646c313ec530ac57e6ee8de04849b8846556fda10dd762f92e44a5ffa54d32880bed4cd77cec99ae865de0203d123a
EBUILD funcy-1.10.1.ebuild 437 BLAKE2B c28ac7940780ec84d5b530c59b87b4e42b47c264d439dcd824e088705fd119553ff0cde812165948b5f572168f9d8611462d6deb59fd6209a090aad4549f0e85 SHA512 78f7d8fd129bda101e70856a1d97f96173117d0da4c277d6a3a6e87ff89b2b4ecf87fe001272bb1888c1e3fdbe83ef81cb4b5bcfc6eb2cd12d8b4cb76cb96b6f
-EBUILD funcy-1.14.ebuild 449 BLAKE2B 5f1e1d501fb85a97bfa6636c87f55590bd80c78e04d14a3f72268a18affc16f73fa2388e3a8b724f65e08baf7d3982c39158b19d7058ac7706a575854c7da747 SHA512 2daa96571002b5c72712a534aa0d1329465d83a32517cb4b7de44fb5babd66598f35f8a1b3f61ce525a4c145838323c90731d5d52c887f2295ecb7b9f537c112
+EBUILD funcy-1.14.ebuild 448 BLAKE2B e88dda9d0b19cd25cf5f669cc5e4f19916925dba0b858222841a799ff193f5209b0c5b22a63fdbec95e450f6a19d5d6cc4157e1d7ead532efcfd22c241f8fd88 SHA512 4a867c96195d4a65aa6abb1a4a1087a72ab7bff131cc905c1debad6fb1e28d981f9543814eb30393881d4e9936c6654a43328e4eab41d1255188fafa0089f653
MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
diff --git a/dev-python/funcy/funcy-1.14.ebuild b/dev-python/funcy/funcy-1.14.ebuild
index da293bb086e4..9e8501191d4c 100644
--- a/dev-python/funcy/funcy-1.14.ebuild
+++ b/dev-python/funcy/funcy-1.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE=""
DEPEND=""
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index 58a8e2efb354..8716463ea3ea 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,5 +1,5 @@
DIST gast-0.2.2.tar.gz 10294 BLAKE2B ad81309b1dd938a07f0cd39c21d4f89af6d902c136b8fe12afc5b26827c778f12561e06c66648a5b672b1c9d9eb79b3dfde7cad0acf8c7099451841b67c0daf4 SHA512 0be9b2b66b7815153e6f294b4db6b028c321d8a94d97c89d89b026df73e0c95dc2ee8af5c10f2eee51cbfb94af4b5a0da8a682896861870b98dec4c6c59a5dd3
DIST gast-0.3.3.tar.gz 13760 BLAKE2B 0298ea81d3d133f8305fc6a7cf020213a75c2dbcb09c9648e533b8c2c58cf3e3f363448f905c8295bd34db0023be6dea00de0d901bffb1d55650773f7acc0135 SHA512 36869a5e0976223a5a82be8bf25a01654896f4de70affe0fec5252104ea6d1fea3eb8c5153530fcac8addc47b51535b02e3920a0e82aad11ba1ca8350cd11341
EBUILD gast-0.2.2.ebuild 457 BLAKE2B f3bbda9a508e4807d87edcb71cb4b69ffa29ebceb6ddfe20e7302b3daffd4c64e3bb3f7d0d6aab72d0dad774eddbbda3703985295a5c59036b5c85ac3961902f SHA512 cfe70fee53cc47118c63e3436789d37144ad954ddeba13141996373b47df254ecadd531ed6e125f793f7b80b6f2efc6fddaaccb95dca6e1641b313089400622d
-EBUILD gast-0.3.3.ebuild 459 BLAKE2B 9ca738c22de92d2348f5442d0530e0de6488a3174c45e58fc482ffccb5b445f4e82f9de274d539153f38a9c1421f6f15018a8f621537d0aa313866e37231b476 SHA512 91c66bff2e06e20ecff7becb9b0c9721a42cf61951a45508fd35e16877d354a2ec92bedb548aefa77543f75c5810127a6faccb4736eb63747b8789201f4adc13
+EBUILD gast-0.3.3.ebuild 458 BLAKE2B a2523227e20e5c3964df1f21107b3019034f41bea585ec67a3a1cbbb2e41c6610401f1647555b446abe5b18bea1e47d7b57105d1b3d8926a3bffddf9e6e8c1ff SHA512 4c4033f429bfb159b621c290c34eef7b667e163716805ea2bc928b879154dd8ad9281642ac15792f15b4f50a7efb1d267b35667aede0f68f72418f6e5b3e5507
MISC metadata.xml 484 BLAKE2B d3b8be13b37bd1a2ef98b2f164c901cf21c8b73ef9b13914200c85ea26eb07dedaaca66b008dccde88dfa1bfcb733e25aac9920704625b87ce0a11a04e02b489 SHA512 5a3d09427a29d39047f396c91ad544a6cb5568f2af06216fcabc1aa12d9e4d34a71cda272d38667d8fb0114d54971626ad3de0c9d71a708cccd825ea1d7e2504
diff --git a/dev-python/gast/gast-0.3.3.ebuild b/dev-python/gast/gast-0.3.3.ebuild
index 208e4d941208..1a3aed50379c 100644
--- a/dev-python/gast/gast-0.3.3.ebuild
+++ b/dev-python/gast/gast-0.3.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE=""
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index d17daab621bf..035bff2759c9 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,4 +1,4 @@
DIST Genshi-0.7.3.tar.gz 271238 BLAKE2B 20addd3243980574e6e2024a7c275c157392987c5265aaa71527e78b92bd25ec476de21d08f6b442de420a925654a064a0071bbd8cf056c0eb18cd8fb085af8c SHA512 b153a9755f9791f349dea35e3ab3099af66b1be5b83bdea9d356b456ddd4e1ff88f7a85e822a2c06aea936c2f843bdc8ddc91c74de2a72111896d8db9a195b87
-EBUILD genshi-0.7.3-r1.ebuild 790 BLAKE2B 33c4b4e028a67d06e3f6e74cf308467df1864a15b63672474da2501329e4567db9962677b101872c7142ea129b63e4d35b06b879434906505ecca760e2861bdf SHA512 e44b1f962c6749247042f5916111e1dec436deeeff77be2d15f38de731ab5626fcc62733d97d0d694d2124622d491e8d2d53ec584803526899441963d825b4e6
+EBUILD genshi-0.7.3-r1.ebuild 787 BLAKE2B bdb25fdb940bb73759a8769041bdff11a74aa40e4cd577a0450b123384d3386e87e2ab711ac9c93e64b18dbccbf74fe6d30cca54ff384856afa783b2039ea6b5 SHA512 a205b0f952f242d598c56ad809919c0683a5f7b01c371ae84855908104ec2570901332f73bdd2e95d82d3e0e8f4241b82e4d0552f4270ef38153529c65ba10e3
EBUILD genshi-0.7.3.ebuild 846 BLAKE2B 3c56c5ff32a3ea4946c1464f3869237b2271bd036ee7cfb1c8eb27fe111bbeb096d6c81849e2b60f1a187789643f000be2e809126cb7d716025712b9afe1e46a SHA512 eaec154394fef0c99d6fad57350aaccd66ffb7eeeaec73806f0f6c4f3ae777b98be13c4930f1449692f7a4ee220f3f4b7ceab96a3524b61760342b4ddc69aab7
-MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
+MISC metadata.xml 271 BLAKE2B 31405284f0b172a72344c5300348da7b62689758b67e08380f46cd0b4d58313324f234550c2d8ffad7cf2c70165edf59c24a8b32ff6aeb82b63f7c40fc4180f5 SHA512 6c24a69f1cf6d89afe9dcea1b07cc8fd3fb9debc3cbfd154dcafa42bb18c84005e83d9204b9a21d91bbb23e952b1069d2f72c753e644926ef9bafd3d86fb4e2a
diff --git a/dev-python/genshi/genshi-0.7.3-r1.ebuild b/dev-python/genshi/genshi-0.7.3-r1.ebuild
index 7c06bf78d983..107da6d4139e 100644
--- a/dev-python/genshi/genshi-0.7.3-r1.ebuild
+++ b/dev-python/genshi/genshi-0.7.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="doc examples"
S="${WORKDIR}/${P^}"
diff --git a/dev-python/genshi/metadata.xml b/dev-python/genshi/metadata.xml
index e24dd86faa2a..ec3c387df89f 100644
--- a/dev-python/genshi/metadata.xml
+++ b/dev-python/genshi/metadata.xml
@@ -5,4 +5,5 @@
python@gentoo.org
Python
+
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 1b772f141e1f..3333d9310247 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,11 +1,9 @@
DIST gevent-1.4.0.tar.gz 5169595 BLAKE2B 0c78f67bc94d15419b8eadf8825d9657c6a7a82756308216e1ca94d5465c25836cb736b8b370a12d1003eb8614effd4110d8ed47ee2b0d7febc2bda4038adc0a SHA512 6771f4f2932055270e4f5a79ae815e93fd0f471defa7f437dc84907ea8b44672e05ae5eb6958f8d90580b2471785dce4044d9d1bbea0dd0c34c1381d88af0344
-DIST gevent-20.5.1.tar.gz 5566653 BLAKE2B 1d9a474681573ec2e9d3c0d40fbae8a91b8cfb80c3ff8b3cf0e119b0484458941224302afb59f16c3272e1d770b1c1e92a3f648754a81d2e894e35ed8a335c31 SHA512 c6f9360efa86e598b7b240cd15e24ee0711dc314bb14f8bcaee7b0768b34a0f090d66296819f4c2eb95fe1565fe1c0f3472fb47444c31cfebc348b420811aed5
-DIST gevent-20.5.2.tar.gz 5567755 BLAKE2B 9cac45f92c7c1841cca4eb52a54f71406beb3e83136170610bba326a32722de3c5ebd3b777a45b73ab5e1012eb0dc49d861b042bab0c6194e61f44e6011ede2e SHA512 24f00a599f26d673947f0ed5582f8b55d1b214677578d7c5c2f8d8c106f89a98951db523597c470bcd788de9f6b7abcd3f25f7aff27788227f6d8c7ca7c183c1
DIST gevent-20.6.0.tar.gz 5803237 BLAKE2B 97b988964ef80fcc1c3238718b6802016fb46742c94e7e56b5196139181ff82ce60816e0a8ccc5c3e1c3b73ec11cc705884b5ac5524dbd5116dc0d8722ccc7a4 SHA512 28ee030934d3c379577c9f86b76838e5d76c7ea7c0880cdeac9dc5ead497ae0600fb02b2984c7312fd42319142200c674b75da2e93b58fd4a99882d601a95108
DIST gevent-20.6.1.tar.gz 5806150 BLAKE2B fb75e440f31ad2952d1395780a66ee673c55e62b635a2c6757efe9706c404d126c38a613ac08cd088900c0b10913fe9ce9d57cec8a7cb252ae87912142cfafce SHA512 b7ceb5251b01972a11e3d51e1ebcaaca7c08d36b6ba7b138bee57f0d5da4553539a0ad538e8a433321bdac396788acbfb0ac294191e829df3f066d00816310bb
+DIST gevent-20.6.2.tar.gz 5806612 BLAKE2B 8b1fbd991cb169292d33001bb0df06702d36eb3849c9251e4fac9e2fb5826eda3435971e39e209f1f537536081ce2730e561e91c398ee66a9b1d55c9d0e5a81a SHA512 65caa9caf8a2913b4c3bcc9a303169ce5837a0d7ccf4fb6b7583bf4ec3a0b288d65fc7e28399f0715e61aed128ffc6e67fc9b455474e47263236136a492021f4
EBUILD gevent-1.4.0.ebuild 1719 BLAKE2B f933f4b4d229f0b8db7a02babee639ce18b9a44f9390b2ded21b0ba6ec13ba1c13baa2a412ea50ec10bff84822a839ad711dea20bca3fd9e821e7d6a057d6569 SHA512 b28a51f9be4ae39bcd8b41e30adc5b5cfdb959758f6437c5dfa017588730bc50fbb8205552edd5de7b90792da021a55b92d3ed027ed7181f5467e3dc62f257eb
-EBUILD gevent-20.5.1.ebuild 2282 BLAKE2B f52fc8d73a974b29cab3b1d356ab9f90c8f00179fbbe14b4837fc93310ca8a5f62cc6c2d999c506fc1f1ce8a6e0e285a519f5cbc0ae59c8c34bf9a01c2450695 SHA512 aad4f67e2f49b2f887328f74f0d6d12e8d0fa79e3f2c934c1cd721aa706e903ada017f2352297b0259ecee9ee6564d3e1337053d9a942e47b84233d1d54e3110
-EBUILD gevent-20.5.2.ebuild 2304 BLAKE2B f2b330589cdbe511c08100a4628db73db079b34e73eec44491beb21133179ba6220310b8cd6b1d77f299bd781574081f1be9596fdd072a78d6f81d0d01eafe70 SHA512 b58d012753b4de9dfcadf74977f7f1988c01c32f498323e09377602fa0745c54d1ad2f2dfe0759f3dd54e5b4a900db66d5036f684ef8a459c0de0c545347dec5
-EBUILD gevent-20.6.0.ebuild 2304 BLAKE2B f2b330589cdbe511c08100a4628db73db079b34e73eec44491beb21133179ba6220310b8cd6b1d77f299bd781574081f1be9596fdd072a78d6f81d0d01eafe70 SHA512 b58d012753b4de9dfcadf74977f7f1988c01c32f498323e09377602fa0745c54d1ad2f2dfe0759f3dd54e5b4a900db66d5036f684ef8a459c0de0c545347dec5
+EBUILD gevent-20.6.0.ebuild 2298 BLAKE2B 1578f929d75d263eef4a758837ef8709c97af80ecb452d216ce3eac77a4e2a7ba1f02fbb483a464d3abf9995486e787ce03848f6e8fc3cce7515c484fffdb5b3 SHA512 fced5307bafbd5d7b3e656d8b05d7de8ed9273d397a2b2aa9643359b5db5812981d12defee4a3c9c87f8ccbe2a4eb6b0ec0b80a695b55b6705a52a27579529dc
EBUILD gevent-20.6.1.ebuild 2304 BLAKE2B f2b330589cdbe511c08100a4628db73db079b34e73eec44491beb21133179ba6220310b8cd6b1d77f299bd781574081f1be9596fdd072a78d6f81d0d01eafe70 SHA512 b58d012753b4de9dfcadf74977f7f1988c01c32f498323e09377602fa0745c54d1ad2f2dfe0759f3dd54e5b4a900db66d5036f684ef8a459c0de0c545347dec5
+EBUILD gevent-20.6.2.ebuild 2302 BLAKE2B f1d8f2e4772543e2e23aba45d1f7dc5d5d28f35234359ee05f84e1688943336866582a7e49a74e4a24ff7bddcd43d662b190de0d0d47d90822b1d9ca8e0cccfd SHA512 dbb184f1a57e0d51f6ffc824e8e697b13eed471b62455f43965ebe2317cd0557a7a248dbd246b55fb7042a12466ec1b54b76b3ae72a2dfb6f81b7a4826119dc4
MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-20.5.1.ebuild b/dev-python/gevent/gevent-20.5.1.ebuild
deleted file mode 100644
index 9c22b6bec13b..000000000000
--- a/dev-python/gevent/gevent-20.5.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/libev-4.23
- >=net-dns/c-ares-1.12
- >=dev-python/greenlet-0.4.14
- virtual/python-greenlet[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/zope-event[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/futures[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- ' -2)
- )"
-
-distutils_enable_sphinx doc
-
-# Tests take long and fail terribly a few times.
-# It also seems that they require network access.
-#RESTRICT="test"
-
-python_prepare_all() {
- export LIBEV_EMBED="false"
- export CARES_EMBED="false"
- export EMBED="false"
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- append-flags -fno-strict-aliasing
-}
-
-python_test() {
- cd src/gevent/tests || die
- # TODO: figure out how to make them work and not hang
-# GEVENT_RESOLVER=ares \
-# "${EPYTHON}" -m gevent.tests \
-# -uall,-network \
-# --config known_failures.py \
-# --ignore tests_that_dont_use_resolver.txt || die
-# GEVENT_RESOLVER=dnspython \
-# "${EPYTHON}" -m gevent.tests \
-# -uall,-network \
-# --config known_failures.py \
-# --ignore tests_that_dont_use_resolver.txt || die
-# GEVENT_RESOLVER=thread \
-# "${EPYTHON}" -m gevent.tests \
-# --verbose \
-# -uall,-network \
-# --config known_failures.py \
-# --ignore tests_that_dont_use_resolver.txt || die
- GEVENT_FILE=thread \
- "${EPYTHON}" -m gevent.tests \
- --verbose \
- -uall,-network \
- --config known_failures.py \
- test__*subprocess*.py || die
-}
-
-python_install_all() {
- local DOCS=( AUTHORS README.rst )
- use examples && dodoc -r examples
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/gevent/gevent-20.5.2.ebuild b/dev-python/gevent/gevent-20.5.2.ebuild
deleted file mode 100644
index 1448d3df4c13..000000000000
--- a/dev-python/gevent/gevent-20.5.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/libev-4.23:=
- dev-libs/libuv:=
- >=net-dns/c-ares-1.12:=
- >=dev-python/greenlet-0.4.14
- virtual/python-greenlet[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/zope-event[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/futures[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- ' -2)
- )"
-
-distutils_enable_sphinx doc
-
-# Tests take long and fail terribly a few times.
-# It also seems that they require network access.
-#RESTRICT="test"
-
-python_prepare_all() {
- export LIBEV_EMBED="false"
- export CARES_EMBED="false"
- export EMBED="false"
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- append-flags -fno-strict-aliasing
-}
-
-python_test() {
- cd src/gevent/tests || die
- # TODO: figure out how to make them work and not hang
-# GEVENT_RESOLVER=ares \
-# "${EPYTHON}" -m gevent.tests \
-# -uall,-network \
-# --config known_failures.py \
-# --ignore tests_that_dont_use_resolver.txt || die
-# GEVENT_RESOLVER=dnspython \
-# "${EPYTHON}" -m gevent.tests \
-# -uall,-network \
-# --config known_failures.py \
-# --ignore tests_that_dont_use_resolver.txt || die
-# GEVENT_RESOLVER=thread \
-# "${EPYTHON}" -m gevent.tests \
-# --verbose \
-# -uall,-network \
-# --config known_failures.py \
-# --ignore tests_that_dont_use_resolver.txt || die
- GEVENT_FILE=thread \
- "${EPYTHON}" -m gevent.tests \
- --verbose \
- -uall,-network \
- --config known_failures.py \
- test__*subprocess*.py || die
-}
-
-python_install_all() {
- local DOCS=( AUTHORS README.rst )
- use examples && dodoc -r examples
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/gevent/gevent-20.6.0.ebuild b/dev-python/gevent/gevent-20.6.0.ebuild
index 1448d3df4c13..879880181344 100644
--- a/dev-python/gevent/gevent-20.6.0.ebuild
+++ b/dev-python/gevent/gevent-20.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/gevent/gevent-20.6.2.ebuild b/dev-python/gevent/gevent-20.6.2.ebuild
new file mode 100644
index 000000000000..2590a6eaa2e4
--- /dev/null
+++ b/dev-python/gevent/gevent-20.6.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/libev-4.23:=
+ dev-libs/libuv:=
+ >=net-dns/c-ares-1.12:=
+ >=dev-python/greenlet-0.4.14
+ dev-python/zope-event[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/futures[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ ' -2)
+ )"
+
+distutils_enable_sphinx doc
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+#RESTRICT="test"
+
+python_prepare_all() {
+ export LIBEV_EMBED="false"
+ export CARES_EMBED="false"
+ export EMBED="false"
+
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ append-flags -fno-strict-aliasing
+}
+
+python_test() {
+ cd src/gevent/tests || die
+ # TODO: figure out how to make them work and not hang
+# GEVENT_RESOLVER=ares \
+# "${EPYTHON}" -m gevent.tests \
+# -uall,-network \
+# --config known_failures.py \
+# --ignore tests_that_dont_use_resolver.txt || die
+# GEVENT_RESOLVER=dnspython \
+# "${EPYTHON}" -m gevent.tests \
+# -uall,-network \
+# --config known_failures.py \
+# --ignore tests_that_dont_use_resolver.txt || die
+# GEVENT_RESOLVER=thread \
+# "${EPYTHON}" -m gevent.tests \
+# --verbose \
+# -uall,-network \
+# --config known_failures.py \
+# --ignore tests_that_dont_use_resolver.txt || die
+ GEVENT_FILE=thread \
+ "${EPYTHON}" -m gevent.tests \
+ --verbose \
+ -uall,-network \
+ --config known_failures.py \
+ test__*subprocess*.py || die
+}
+
+python_install_all() {
+ local DOCS=( AUTHORS README.rst )
+ use examples && dodoc -r examples
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index c0a91bd6dd25..8eed7334f302 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,7 +1,9 @@
DIST geventhttpclient-1.3.1.tar.gz 82598 BLAKE2B 5fef20a74c431ed53be4eedb3ec7e040572ad960363d41dda8b93c8f08f3eb05ba6160676c1c3ed957d1528a12aa297400063377f3788754e9e76401bb3421ae SHA512 a50486e1485c449a821176f0aa139cb05a3c7675fb045086e086cc7bb71d6e1d75191fae6972b381e7e69dba89d23c387464503845badd29fa361e03aa866079
DIST geventhttpclient-1.4.2.tar.gz 57535 BLAKE2B f3c17140698b1609d9953110790fb536d982782c60165c717b6cee290c0b8fa5ae99cd6935401b6b617f0bd021783dd3f836c7cff775f513b9084714da1575a7 SHA512 3252d27f07a4642ba34d449664f50451b2ca4e44dc508345133d21acf659251a66be72784bacd312c074de4025dd5e080bdf35c84d9f7d40057132184a4d285d
DIST geventhttpclient-1.4.3.tar.gz 57541 BLAKE2B 6b28cba862eb01bb1a298c2e228eac4f4bfbf91cd138d0e77f54a91184672f089d3233b7287940b3892fd7e732c924612044abba0704054112f8c0563d9ed741 SHA512 1360a95d367b3bbf03294be916f70f8c2e655b77180a7ff44e67a40508584500e4a0017416639c0a90a974fe53cc7895dc9c3f7bf43d3a34fc4484f804793c21
+DIST geventhttpclient-1.4.4.tar.gz 57620 BLAKE2B 20b60cfa7e8221b050bfd95a6e23c2f3eee87c0df1e93171719c7ba1804e88c918471cdd01cf4c6020fb6d44d0a1b911ee09dd44cc1e150b5d18d6052f2904cf SHA512 c6a8580707f3178a3a55eb638b9e3f36f82aecbd8a5ce044f0b8c167d88ad2bec584275bed6b720a5f7a546b0ffd113bec28dd2e1ff4290c60f0b5e13542b737
EBUILD geventhttpclient-1.3.1-r1.ebuild 1470 BLAKE2B 5c08f4e43d28890245194350a1eff9113c46b37a803510f927388c4467ee9265be75938012b1e84a581cecba909ca1e28ac09f3a982592e1566e8bb5a188d003 SHA512 84a7f80f7c5565ef21992fa8e16eeba1ca9be28cf49a3b6e8dcf281656cc23a6ecd6c9bd7199a174fe3f7ab48e66697785b87a5426cc11f82826a78a0da05759
-EBUILD geventhttpclient-1.4.2.ebuild 1531 BLAKE2B dfa676277ca7a529ae91c206f8de6438c6f9729a3e65086122adeb980f0e266d488659628e00a931f7e02b2a70b9a9141e5414a3def5a7ca426fd4af4933ad1e SHA512 c82c31c24b40299e3a4e2c395480e87fef085f6f8f317ca85ae2a5bbca8b255fc69cfddb53105fbac653383d4c75d10fc310bced6448a1dfd2fc9aa3e89e4e2a
+EBUILD geventhttpclient-1.4.2.ebuild 1529 BLAKE2B 61dbf58560a8c59e6da50b097e7d7f2541c748d91cb6a69476d2d976d1aa9dc2cc67cd43085d52737e3ea4b78b6cf5394e224cb5958d092790881b450a3c433d SHA512 8451901047be3dcf40e749d042b23ecbe787e8fbcd79414bad7c83ec36466d9ae05ce1289c51005bbadab9e5d02a968f6664a712e9bcc78c6613a26911ab780d
EBUILD geventhttpclient-1.4.3.ebuild 1533 BLAKE2B 821b0e96daf6a106197d6a75409c2766c15d7c0110fcef7aae35a4a0bf9c043a96eaa6802514190858b98f7f8009e860b2f479e5b0f0c6ae301e79c8676c1667 SHA512 a67326b5ea5ac6cc4d1e31dfa616c6e4b092d536c21fa147d76fd36b8ca9e3c121a1d6f12d9dca0b349f5cce5cc083c0d7b64435283c34b2a4d972c258d7aa16
+EBUILD geventhttpclient-1.4.4.ebuild 1533 BLAKE2B 821b0e96daf6a106197d6a75409c2766c15d7c0110fcef7aae35a4a0bf9c043a96eaa6802514190858b98f7f8009e860b2f479e5b0f0c6ae301e79c8676c1667 SHA512 a67326b5ea5ac6cc4d1e31dfa616c6e4b092d536c21fa147d76fd36b8ca9e3c121a1d6f12d9dca0b349f5cce5cc083c0d7b64435283c34b2a4d972c258d7aa16
MISC metadata.xml 454 BLAKE2B c0c62b4bcb9e480cdbc6739010039421f139999d7df9673d260ee2365073a108479892dce53e86e1f8ec721c9a33d3967bd41e468994331970a583189aa8c0fa SHA512 1739f134e47ed32c68fce16d76684f6c2393f1e25fe0b098499b1362379cca9b7522950ef77afd9d8e063e1e0335e50dc3cd44192d91ef01adfae68c02fd9d96
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
index f1ad8d5daaad..4f2a0c038631 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
new file mode 100644
index 000000000000..4d3f4094b52b
--- /dev/null
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A high performance, concurrent HTTP client library for Python using gevent"
+HOMEPAGE="https://github.com/gwik/geventhttpclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-python/certifi[${PYTHON_USEDEP}]
+ dev-python/gevent[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ ${RDEPEND}
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
+"
+
+python_prepare_all() {
+ # Skip SNI tests which require dpkt
+ sed -i '/^import dpkt.ssl/d' src/geventhttpclient/tests/test_ssl.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ local skipped_tests=(
+ # Require dpkt
+ src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_host_in_ssl
+ src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_header_in_ssl
+ src/geventhttpclient/tests/test_ssl.py::test_explicit_sni_in_ssl
+ )
+ # Append to sys.path to avoid ImportError
+ # https://bugs.gentoo.org/667758
+ # Skip tests which require internet access
+ pytest --import-mode=append -vv ${skipped_tests[@]/#/--deselect } \
+ -m "not online" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index 9b12628ac254..3d4771f55b71 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,5 +1,5 @@
DIST gitdb-4.0.4.tar.gz 392964 BLAKE2B ffbf9d78efc1a12e63ce639018a9c5fde366ae14a85b0ec7ba2866678dbeba2c31ff18cac9b5c4caa2b7e150d3aa5d55434352c38a5155477e053c5ab5eae707 SHA512 a0b2aef8b8b3487c22faeba5d6a60ff2b1a97e3ef075f28bc27140c973242b096463839516ec233065710b7450cb4d885904a7a253e2b518379283edd40cc489
DIST gitdb-4.0.5.tar.gz 392815 BLAKE2B ab0c557f1233ec6f454769c3d72d982c876cf7b8f67d8b36f9ed8a6a2ee4a04a7a22e1a7453aad0d128436e679940ffea9b2c1e6d433083634b47ffff08b396c SHA512 a3f562928a863121c4051663a0674aa94937527b2fc40a7f392d2913d4d1443bda278e2f7cf362d499389691d24a2d965ab89a6533d42a157db3ab629a377e83
EBUILD gitdb-4.0.4.ebuild 1153 BLAKE2B 2349d55dfd87dd61aa440ff413c45e7618bb48a651c274ff8daefdf90f5cedd00ee35e609de92e43a061867f430c52ac2da925859ede5c9c9ecb3198ddb63fb8 SHA512 41e1be5ccdcaa0952f4d08f450d17c35d730f1dc1917a7755a7424857f9984b90ae56fc41c9d11df4d931b6a7c6f4df57e29408a3980e8dad499fe17fe05cbc7
-EBUILD gitdb-4.0.5.ebuild 1155 BLAKE2B 30c6a9fab6c97381e1d54e654c7c53113cc1801fa5e767a24b091017cddc339e874b82abfa87339e4d6c08ccdfaff6fcac51b60f985cf5b1775ddcbefca89b26 SHA512 4a050c42a3dcd29cb12f86e413f59ffba4e80c3ead9cf28b75913111fa165c688cee308d5eda985ecfaf1b85d049591523b53c1b69cfe86acd0ebf4176ea5487
-MISC metadata.xml 386 BLAKE2B e2ecd87d0601911cc37bad5055be83f73a24daae101ca7ef85d948d21251a14028947c285b0812af717b58eec399aee6cbc7a1cd67f58857d090d4142198429e SHA512 b9c7e7c5575d60c1f6f50f5577ca4bb9ba64285555890400edf4a7118d9a7546d71eaffdb9cc222e464b9397496ad832595e8d4f864228421a764b9ae3c3ad87
+EBUILD gitdb-4.0.5.ebuild 1152 BLAKE2B 469dd2a2cbf6a5ab0982a4aae6fc413a660bfa62c20a6c433850b75ba33559d9fc36f5261a7089a63ca0d1f7e0c7abbc7cf1cd9814f202fd8ce7dd489ba64fd0 SHA512 15fde3d0921a93abda3e88fec07c75a55bc942a4809c6c200335ee92f29c1c7e5c8ff2fd6096d15e1c8c7180244307631e838c7c3de7ae25bde6cf4b2fda0f66
+MISC metadata.xml 411 BLAKE2B 270925cade7731451404999603981322c15224b7a6a2580c957af06cf8dbc940adeb40a63452ae6ce11f725a01af58ff56e85c4ba63a92e2027f4c13c81e1689 SHA512 361528c0a12026a9bef55a22d172ca8fbb0f82389ad2e867a2d8bcf65913cff9a2d510121f6b54be00a1d8ccb2bca471e2c3579054d3746fcedae910d4f3b361
diff --git a/dev-python/gitdb/gitdb-4.0.5.ebuild b/dev-python/gitdb/gitdb-4.0.5.ebuild
index 109ef5fb25be..0ce35c56033d 100644
--- a/dev-python/gitdb/gitdb-4.0.5.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
RDEPEND="
>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/gitdb/metadata.xml b/dev-python/gitdb/metadata.xml
index 95de8c8c4ea2..44cf024f6e33 100644
--- a/dev-python/gitdb/metadata.xml
+++ b/dev-python/gitdb/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
gitdb
gitpython-developers/gitdb
diff --git a/dev-python/google-auth-httplib2/Manifest b/dev-python/google-auth-httplib2/Manifest
index 357cce3d29b1..0fabd47a53bb 100644
--- a/dev-python/google-auth-httplib2/Manifest
+++ b/dev-python/google-auth-httplib2/Manifest
@@ -1,5 +1,5 @@
DIST google-auth-httplib2-0.0.2.tar.gz 10830 BLAKE2B 7f2092d83c318510b9140791681a58bd3e436f3b5966c8dc53aa5b041e50fdc4f93c276810a0e6ca20b14a919eb37588ae1d027b5eba74f79f44a6809909dd4f SHA512 ec111fdad930bfe3f8f97df70a8bef955920ab2cb0c383d7888ff444f19e5c176dd5aabe10f9a870c86035791a2b27e3e8e1276360626ff5e430db823da5efb0
DIST google-auth-httplib2-0.0.3.tar.gz 10914 BLAKE2B 20473182a5bd4633d1ae16101d81520ddf182706d478c066e533a2eac3e28fccf2bbaf733eeb4f7ea14d658fe29b9b0c656307bb555aabd2d1a21585e3e3d3ba SHA512 dc39626961dfc67ee56d1c74b4e37e6c6a81ec3c8ddcc24007535acc6a973f2cba5e65a9ece323f53d4dcb4f7bca948d65bde4ab55b2c002432d020cba9d914e
EBUILD google-auth-httplib2-0.0.2.ebuild 1166 BLAKE2B aa9b6d9da543b3af2b071f4bb0fb52a2530aa5e641e521a6017295263e1a0702ad26bd24691317997b9eee86e2caa90732f7f5f5f3f272368e4729034e03e666 SHA512 89111fbca4a7728590f2f7630951b8397bc1fa49ca1e70f38e63282fd3ec44a3ec31d59db4fc41f6e4231a63d8b949880c87677f031e22fc0c536b7d72336a8f
-EBUILD google-auth-httplib2-0.0.3.ebuild 1174 BLAKE2B f7cb89d6a041b17b68d39074bfe5545a060c899cd03ceeb4836cb4a1141c4b3621b66d5d91126e096aded05529fe781e66d1ada980f4b001d57f977a3bd9d6e6 SHA512 63160aa6a87df8c4783667a74ac350aa5b1d338cadbb71eabe66cb535c1d5bc4f8a9768b68d688c400cf53078f082d6e6f7342f2aa4ade8bafc99a0a9991811a
-MISC metadata.xml 422 BLAKE2B 4aa4a1542a90ed8ebc399dff1824e77e9f695104e4e59317af95e21719d993ceea8c5ed512d15cc2d9d4085bdd1afcc70a58e2f0d7ce673508e2cb6f52d3664b SHA512 bba9deccadfaf0b663a2f6239633f20ee02838d98cfa25e4d8c399e5635c4cd0b811dbf821f18edf98b328a56a37146bc316aceed6b5b057ef5fd2cd151bbaa2
+EBUILD google-auth-httplib2-0.0.3.ebuild 1172 BLAKE2B 302eb6c7488dc88d19751d89b822ef04a17d21785f0eb73db4f560ca35f4f31bd8bab2c12430508b87283dd75176f533afd144e9e0ac9b2e2eba507d4c510a30 SHA512 9569206342716579f1db2119cfb005468e6b7637cc5eb90d5260a1d04ffb081a46d84a396a0ef867d2ff56009c7cadf74cbc3dda5428a942c97a401b1e071c6d
+MISC metadata.xml 446 BLAKE2B 5f1f5cecb1d2313f60aec2264a869d2138965894c64a79a311da512bee4c50f21a5d0ab8976598b42e6560489ac40e3da656ddb4d0dd729384b9f7e940672df6 SHA512 1f0be263133f99a92f2557d69a21c861ad0d5a2146635dccedbcf00b40d162810deb2edc4c888f5b69ef0bb4d293463c1484282ba37d92a04329f3ebc67cd561
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild
index e75d2111fc23..2794e587bd4d 100644
--- a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/GoogleCloudPlatform/google-auth-library-python-httpl
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/google-auth-httplib2/metadata.xml b/dev-python/google-auth-httplib2/metadata.xml
index aaafa4650042..0c84d2bfe5f8 100644
--- a/dev-python/google-auth-httplib2/metadata.xml
+++ b/dev-python/google-auth-httplib2/metadata.xml
@@ -5,6 +5,7 @@
zmedico@gentoo.org
Zac Medico
+
google-auth-httplib2
GoogleCloudPlatform/google-auth-library-python-httplib2
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 4e9e6a53cac0..03b4de1e6f41 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -2,7 +2,7 @@ DIST google-auth-1.0.1.tar.gz 133903 BLAKE2B 0a99dcdb37a195f24077162ea8191e2eb12
DIST google-auth-1.14.3.tar.gz 101964 BLAKE2B 096768066d02248a4b614e5ea1f1035c81714ef09f6fb43fdb3ecc308d7cadaf7ad821f1dca505389fd1c73eec5e0b2d233f71f54469c43a2616f64a15661f21 SHA512 e3b76907e50b4927aaa1d450a6133943ad736427a180023ea2c4639545449769136b9db89eae54456338f1cf5bbaaa5840a8cf3db92d54f9e96407ae8935a607
DIST google-auth-1.6.3.tar.gz 80899 BLAKE2B 71e9ef4fbb8803dbea96e1b9b3183f9bae8a9bd7e29eda1c9ee042c7abb3e5011ee4f461ddafd3295119e3a5a451892b8a38cb49702c59828baba1af35403c25 SHA512 47a3e9390428ffa58946c348d4e1a1bfe1290d6e06b75924bbacb37d5af929050690ef5c13820468de805646f4686c035b00dfe947c090d53568dd85d804af5e
EBUILD google-auth-1.0.1.ebuild 1359 BLAKE2B 58e37f1f7005b7af6c0775278d0a8220a6e3c1b2574bdfb4ad5a62dc37a2b64e1ffd52fd0b3a838e08d0275e789a521c2a84d9110a0e787c226070c3c82286c4 SHA512 ff48dd4fd546aa8bd3bb629e44c56cb91e54d0c962d1d80de24596e75d37a16eafbb611aede2b0763badf15d691dcea29e8251d9c9c30bcf31ff659dd5f7464e
-EBUILD google-auth-1.14.3-r1.ebuild 1477 BLAKE2B 5b8d5e861d452e868405f476835ea530c816e76506ca26b87cf0fda9d02aa448f10cffecb256ce776a3c59ec58f417c72162ffa2c2e414d67eb0d1cd5aa42d54 SHA512 d496baf4377203c1908d483fab5e6acebd82558ca509f0e60845afcb979ccb4048397808f69ab162b249727d2910bf5ea29005a17cacc993f7846dc8f834bf9e
+EBUILD google-auth-1.14.3-r1.ebuild 1475 BLAKE2B 260f16858f9ce755a5c2c76bd221f3092b627f85193acb20540518a27c97686e2a8803dbe36736aa2963e1e830680f79095dd9f0f3081e531694be38ee093633 SHA512 6ed077ec8907bae23dd33b655b1a0d5b9738bdc7b4ee5e4fc3281fa68994f9081e4cea5c0978abeb19863a49db687e34ae0ee019170eb6e2fff20da4149e10ab
EBUILD google-auth-1.14.3.ebuild 1284 BLAKE2B 9c7fbc8767884a2ebf840b34e828ccb88dafb7d5fd2c1dbc90ea8da23668cf8b9ed53822de989eca62c9190431f37b67ee2427d8115218d7329039a2a8a2b36f SHA512 4824dcf339a3987b910a260a71320fb618339c0fc9c630f7970b7f7e41dad147093361e1be546ebf8710ce181030877dd5992cb9029a3add76447d23db70ebbd
EBUILD google-auth-1.6.3.ebuild 1280 BLAKE2B ec8a8c550643d8f25de5a51dd1b3d502c8156c86ff863b619af5b3c5041df20891f3606fa0bcca53dc555dc6b987bec1192db979088af41dd062bd3ac3450a9f SHA512 0136a2964f1210a729e1f2a9364ecec4f5e07672cb3a1824f8b60b98dcec7a824ed9ab67db46a3926ccdc3d5dfe263f137d78c083eee9edb7e292a4460d920f8
-MISC metadata.xml 404 BLAKE2B 5a7234bdd9c08a076980997db1c4fa12d2d2ee37945ccf2308e5bbd92bd01b5cbccb195a1a567f3ab82b71a1d64bf63453b4dffb2e2d7e93fdacc322f8612896 SHA512 ba3c9a09c5bc382da4c8594011872eca305111afa671adffbd3d4c04f8d772cc37d43d83385183f38311e9549c12ccff14f44f85352c49f778766134075ff32b
+MISC metadata.xml 428 BLAKE2B 130f36eeb8949f23ff7658277485387897cc1688205de4f5ac7acd4e8e897a5212c07fbe36b4884f4b6d4c4755cbe1e99d0f9d37529a605d0f4df01445e7045a SHA512 82c278bcbbd1329e5b002b7382f11a5bcd8419080137ad09c51db944941669cf072401210d9990d1bb2adf98fd3e60f0f77415d9f2294e1cc2c68023040b9535
diff --git a/dev-python/google-auth/google-auth-1.14.3-r1.ebuild b/dev-python/google-auth/google-auth-1.14.3-r1.ebuild
index 91fe626a7fff..b9496dc3dac4 100644
--- a/dev-python/google-auth/google-auth-1.14.3-r1.ebuild
+++ b/dev-python/google-auth/google-auth-1.14.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/google-auth/metadata.xml b/dev-python/google-auth/metadata.xml
index 9ee4c6540b0e..c773411434f1 100644
--- a/dev-python/google-auth/metadata.xml
+++ b/dev-python/google-auth/metadata.xml
@@ -5,6 +5,7 @@
zmedico@gentoo.org
Zac Medico
+
google-auth
GoogleCloudPlatform/google-auth-library-python
diff --git a/dev-python/google-pasta/Manifest b/dev-python/google-pasta/Manifest
index 9906c96b812b..ec68acb40468 100644
--- a/dev-python/google-pasta/Manifest
+++ b/dev-python/google-pasta/Manifest
@@ -3,5 +3,5 @@ DIST google-pasta-0.1.7.tar.gz 37090 BLAKE2B 55d1846a733d3d593e0df16f360a55879b7
DIST google-pasta-0.2.0.tar.gz 40430 BLAKE2B b3f068c0530149d6e8057a2e7edeb76b1912516a8227a837913783060e30f418159b38c77480248dc7a1586b46c9b5914e93c77a9430d963b3538e2197661922 SHA512 1d75d994a5120109677a58472459a632b31568e6ce79b205688913dc2a94e132fad818c73510b2f7d7adca3c757077543abd8b7f15be035a63fa15d38874c753
EBUILD google-pasta-0.1.1.ebuild 481 BLAKE2B 97b6c1d3acc931792958e574186d793723d991449bfe3e1df5aa39ec72315a5bdb05da5450e73e05fee350392b609884ab2daf98346e2b009d38c13b8a762985 SHA512 144f0b6784b456fd26797dd432f57021a9ce92910585dbf013d9942413d8f7061699027a280c81c87505c8555e8c0c9e24f7a4a804c9442d3d6bc15f9e11259f
EBUILD google-pasta-0.1.7.ebuild 483 BLAKE2B 0db2e7c7ca4f1007dce20ebfd1954a4091563a5cf6224393080fcc70d8a6aee04aa05ef29c821eb1ba636ecb23786334cb1aa9bd447660b809a04ef1ad820d6d SHA512 5a16313b53545658cfa15f9582bfb89519630301d55972f6eaf1fd168445091357d859f1ee1a533059de7508c0cd370195d92b3516fd38fd9572e970cd52b647
-EBUILD google-pasta-0.2.0.ebuild 487 BLAKE2B 5f0b00691a139b83220e43c8b42c09fe099cef8d1e98fb2970b4c32edfb48ac887496b4e7831062a76e05a74c6cc23c4fad7275b3b1c7d214634cb365b16293f SHA512 b7a2af6dd0243e3e42ab78071d3f20e8e75b9a8227c580a8ed3d3c881a3799351090539827fc52de07a1f262c046b919e03ad304d3755929f025ba049862c52d
+EBUILD google-pasta-0.2.0.ebuild 486 BLAKE2B 47df33c482d490dc5c9a7e7c3f86929173d791b0c8ec765fbeb3164b2109734934633d2f7e94d5f924420ba8c5e86bc41b2d0a061a622f089c2931a44c9a44bb SHA512 826e2518d2820b6f08f1944e05eff31b3485c65399efcfe625f692452dcce304971950750d9610eb43d77d6e1eec9d38efffa1ea217db061dcb367c436b0a08f
MISC metadata.xml 347 BLAKE2B d79fee4b6f6d09c97796965687666f353324ddc6e1f83b6a1f9138ff95ab07a77bd66049d5398d39220e7685412ef79111f89aaa11045efbebe55a7c915592fa SHA512 c0eb9737d40e4e982775ca900c962b676b1ad863c1a48c170163f42cf42ce385b44f2d7e2eb26fe955e146015fccaba6d25aa3318347fde65aa999baaa722f90
diff --git a/dev-python/google-pasta/google-pasta-0.2.0.ebuild b/dev-python/google-pasta/google-pasta-0.2.0.ebuild
index 110caa8549be..1adaf35c12f8 100644
--- a/dev-python/google-pasta/google-pasta-0.2.0.ebuild
+++ b/dev-python/google-pasta/google-pasta-0.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE=""
RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 78825709ff25..6100f5508e94 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -4,5 +4,5 @@ DIST greenlet-0.4.15.tar.gz 59694 BLAKE2B 8409e356e7724e1651606507d0d082e77f7f21
DIST greenlet-0.4.16.tar.gz 60576 BLAKE2B e0c53af4b6886fe00f0299a1779e478b7cbce5ff733669e8a62757cef49f034e19b7b932e7900b09e288ff4ab7e883fc2dd5f97f78c0e1b5702e5ba9c9f62fa1 SHA512 0dc473c05c1d54a830c009fe8197fd2017b8f3117532af0fc7970eb5abd93a82bbaa1a8403375a0ac7148fcff63cdc3faa663d0c5e442f3dd10ea3b2f98b306e
EBUILD greenlet-0.4.15-r1.ebuild 944 BLAKE2B 53a91152659fb65a833b02d73f57630ca771f0811b856f103f2919feff0ff37a856d9bdab11de3fc67bfc93e68b512606eec1ee9af8682ca1046615663398b27 SHA512 9662bcd90557b345246db170ac256efd988092cea2b80f26168c2e2cabfb661154659bc76bf231c547bb3e887aa66ad16c2420b4cd0c265d044e8fddd95a2809
EBUILD greenlet-0.4.15.ebuild 1078 BLAKE2B 9358743d448ce37730284759c21b6c8f399a0ceb92239e7d5cb6472b7971ca55924a7ef6030bcebc4b78e0fc3c95a0d9e7687b689692f2aeefd12b1db7eec4f5 SHA512 ca0a5f838972a9302c1f29f0066048dc3262915df6f428636d6a7c824ae1bfde352d16f8f884e72d70938873e42a18aadc802058ec1a07900bcbee410b2537cf
-EBUILD greenlet-0.4.16.ebuild 844 BLAKE2B 84e8c4c15029350de8722740dac80a9bcbca88e0bc7e4289e2ab85c8d2fabc27d8b97f43d595c4f1a3e5f62e1e9d159412440216394b49ba83fa65ce78a7d53b SHA512 532c0b427004e77cc5a0c82636363d95d8106b7c05d52253fa4e6337ead9c736dfe3c47c86f2478c72b7ee0f1f4db391465a9d520cfc74689ab82c7952a7fe1c
+EBUILD greenlet-0.4.16.ebuild 838 BLAKE2B ff83b1e25233c4f62be847dcce24ae483573fcab55bdce7c1fc507423247a3854a77acb63755747988b95bbe491d65bf7da59325ba4b0f53f4b86078b5251d56 SHA512 5c415035a4195ed7ecff2bfb32f7b6b8446dbb27accad581fb76a441165cd4edf761242abd06ada6bac38dddf0b8acfa870a134b234c7fc1c093adc873f9861b
MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-0.4.16.ebuild b/dev-python/greenlet/greenlet-0.4.16.ebuild
index 95b8ec7c7e4f..5570d67d2b80 100644
--- a/dev-python/greenlet/greenlet-0.4.16.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 -hppa -ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc"
DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/http-parser/Manifest b/dev-python/http-parser/Manifest
index 9d91527a282b..42a12bbb4a46 100644
--- a/dev-python/http-parser/Manifest
+++ b/dev-python/http-parser/Manifest
@@ -1,5 +1,5 @@
DIST http-parser-0.8.3.tar.gz 83040 BLAKE2B 8ccfd15154e34756229159576340536e447a1b76375df7c3f56b96c79957a3b28569fd4a4e77303fd1d254aa5652478f7e319e7556150de563f5b12c58482de4 SHA512 aca583d976dcf172244179cc4199336f296dbb2e2838dded23e64d55f23298fe600f9c24ba6cb6d1d5faad3022710154949fd39adecaef763f7589a58d03fbd1
DIST http-parser-0.9.0.gh.tar.gz 101174 BLAKE2B 92b74dffd2c35672bc383ccda59f93723c0f83ecb0fbf0470f5daacdd37f68d4d63de7d4ea53f86d2109349a793b7535cc864f014311dee6ac5e67d0ca751931 SHA512 75e51bef43d9d7698aad69f8bfe651e24784b97603cac55f33bf4c12c86792c8c71d6206f31847d052e4d8621a5ea65a7b34eca5bebdb8189f58e6d98d33139d
EBUILD http-parser-0.8.3.ebuild 926 BLAKE2B 46bffc6a2319555ea102393d3529a6a11ee81371a120b60d4255bd518254ce62179b62a5ab791b4ac4a64cf46955864508fb208fa01acbfc1dca8e4574acb15d SHA512 4d7389cef4c82d51dae23765dd30511a695ea84d05e9b87034af6622a2f0f5ebcd27265d916be7720d2fcc23dde65eee6252d1d576c1defd85c46959cb17881e
-EBUILD http-parser-0.9.0.ebuild 888 BLAKE2B 49b7b1bd729c6c7103761e200b4dd45a69c70394661b9ce02597a6d2432e669aecdf594d26d8e3480bf3abd48a723d4577c1c2cbafd8133cc368fa65dbecd9b6 SHA512 5bc12cf93fcd27e63ed1e3d6b959701d3ca635e389681af3a75f795c6596406b8a13ac5aee5102c7b92674ecd30d1a3fadb436a7c83cbcdd00768bcf43b12af1
+EBUILD http-parser-0.9.0.ebuild 883 BLAKE2B d0806b8f4c68d12cf89e1ddfea304816cb6458c2010ec141536b9dcb430388c69fbb68cc70ec8674ac1a980c4dfe0b452631612c89be43966699e52fcb3ae463 SHA512 1369487ba306e6f02d32c4bc0086b6b3818a34841857a78e7f2d5b2e2eb7d46c7fbb95f1b0a89061c88ab91a28908a903e6d1cad44d453048afc527f13200c62
MISC metadata.xml 385 BLAKE2B 16371b248416d43a094b0038919816277b3dbced190f2684cbc6d0ff9cff6007cb7e5e44d867eff942f46173edf5018a4b15383454344fcfe003544aa3e64fba SHA512 5b4b7b992bf4036ee076a2714bd0b91540b071fac6194ade8327e71062d7dfc5597f68934c275d72756c5ebb25e334059df4112946a1a84ab20ca0710ee16760
diff --git a/dev-python/http-parser/http-parser-0.9.0.ebuild b/dev-python/http-parser/http-parser-0.9.0.ebuild
index 775ab3cd8575..32e797b3674f 100644
--- a/dev-python/http-parser/http-parser-0.9.0.ebuild
+++ b/dev-python/http-parser/http-parser-0.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86"
IUSE="examples"
BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 37309094fce4..8a5844031e1c 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -2,6 +2,6 @@ DIST humanize-0.5.1.tar.gz 20507 BLAKE2B 55d7b598b32658b1d4c4741b37b5c33bdc9d63a
DIST humanize-2.4.0.tar.gz 46489 BLAKE2B bb2cfeebd25f4aa073539bb616a5d05db2827dd2aaa6f093d46b51415ef3b954918a45f2434b9ce41845389be986200e23b1cb752e8a0bd03649377ea46fbec6 SHA512 20707a59f2f0bbc52e1e5d906e733561f53c3bc429ce24662ea9014d7f73f87a8f3ae9aa62f2564fafbe9de0d6b250e8fecec4a3cb81968c5b24d61ad9627d1b
DIST humanize-2.4.1.tar.gz 46827 BLAKE2B e9b37283c5a4db1c5b2a9ef61919fe02a4e5720711129910e51b0b3481290c9bfa4e29225db75c37d83884c00065fa71b599ed42fac41414f481167d33091a98 SHA512 5d8534d2e97f375c7ec065dd239334a2a5da9d058f7c0312cb2683c3e42f5b8f99e117782e0888a6e5348f43958523df6609c294f5af7c971d81bd29679a0500
EBUILD humanize-0.5.1.ebuild 877 BLAKE2B 53fe455e34cd55b205a800b213325e0d49fc5a34def7492befa0c85494ce456f1fb9cbbb9266933d3c53e88f5cfe46df1b5782b6ff64d1f0f926e34dee79ff6d SHA512 c654f8f6343dc8f481adbe71aadc5daeb01f7375d3fe995f59b71989620cb4fea377f4f1c918bff6461b794f6216bdf224bb43d023c6ea46dc306e1c21d525bd
-EBUILD humanize-2.4.0.ebuild 893 BLAKE2B a0353beecd55a641a35a578cfdb0d793733db71e55331cfca3bce3bd670b688845ed49f663348f605c817605cd9df25361db4da509166aa0d3a2ee9f3cb402e6 SHA512 e7810411998ee048f6be2007843c5edce290323f0e3b81f1ecb12335bc14b1ac1a015b170782c9c5924e3e73987827c74f78febe0f08fbef642bad3975e5062c
+EBUILD humanize-2.4.0.ebuild 891 BLAKE2B 207f7258b693d02a5ef90ec6c97964ff951197460f78f5a4a8cb98d45d01e3924eaf1686380366f43cda91f9df04722246786d55c93729a5fbb8c50a5a45a54b SHA512 ba5f4da1f605ded23d73cc040d0f35fe8a6938bf6e92c0efc8048b69127ae5f3784efffba5587b9d13e741945a706028ab6ed3300bcfbd9daadad32c022db6e9
EBUILD humanize-2.4.1.ebuild 893 BLAKE2B a0353beecd55a641a35a578cfdb0d793733db71e55331cfca3bce3bd670b688845ed49f663348f605c817605cd9df25361db4da509166aa0d3a2ee9f3cb402e6 SHA512 e7810411998ee048f6be2007843c5edce290323f0e3b81f1ecb12335bc14b1ac1a015b170782c9c5924e3e73987827c74f78febe0f08fbef642bad3975e5062c
-MISC metadata.xml 537 BLAKE2B 7b1184cce1bc82ce4a25986a86b6652a4504f3655f7d5eeba66f861230670988055c30523b64d1bcd889976f4b18299fd90e326f49eafd24c0e53b13e33bc59d SHA512 d72a8d89642dae3925593e9692108fef34a177937fa48823cecac9ecd1869a6dafdad73e1397a6a337b3517185c049ddc287eebaf0dde992b31f700ee9512fa6
+MISC metadata.xml 561 BLAKE2B a7919d3646edc6a4e7c2e13d74b1ae4eb18e16c41d33f27adb2841e80ab12e5d85f42bedab668c1096740e7ed1323e5accac1ba45a78290f0979c55e39c9d682 SHA512 b31a4947368fcbfb0edf93b48f843c49d5209820cf9da1a8aeb8666ab4fffebac765ca4aeb3cf2523837fcfc9c21d858cecaed65002ac23bb9d946a8c818f113
diff --git a/dev-python/humanize/humanize-2.4.0.ebuild b/dev-python/humanize/humanize-2.4.0.ebuild
index 4785489816a4..fe65045a9ba3 100644
--- a/dev-python/humanize/humanize-2.4.0.ebuild
+++ b/dev-python/humanize/humanize-2.4.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/humanize/metadata.xml b/dev-python/humanize/metadata.xml
index e401be0146a1..27cd9b203a6f 100644
--- a/dev-python/humanize/metadata.xml
+++ b/dev-python/humanize/metadata.xml
@@ -9,6 +9,7 @@
python@gentoo.org
Python
+
humanize
jmoiron/humanize
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index 69525748682d..ae7a0f3fa702 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -3,5 +3,5 @@ DIST idna-2.8.tar.gz 174481 BLAKE2B 68e5dddaae30097522e4e661438d7f89a391c5a0e2f7
DIST idna-2.9.tar.gz 175042 BLAKE2B d111bec6c5682321967818aa3fb828d1f7bc5c056e8c7418589a7b1f9e125aadfd21c6c3329a93b894977c41ad258c4bd38db166b85c1f85c52ca2f0b5acb242 SHA512 2bd3fdae46fe7045640912872b0a3955de3abce62fd222b16ea2c997a04755acc834eeb645e5610d621c176d4b963e1d4a71228fba14efad54999cdf3c02eaf4
EBUILD idna-2.10.ebuild 650 BLAKE2B b1b8ae78c2afc7f5d7d4a33da9cfbbac6c4bbda198bea4ee0d3f175dfef0f5e92141e373d5324322bc75a6de02c975f9bf16f45d0391bde9db5d05c7b571a4c4 SHA512 e0c3b77a5f02c1e706b04fb3827ab6d5f1901f2516f93c2b5d15c12fdc34451f1024c27346e852f9159196385944586ebcfe8aac9f9cf46f7605b0ef4b9d2b07
EBUILD idna-2.8.ebuild 691 BLAKE2B af17b44ed061c888ebcd1af6693d658403ba1c6eea0bea1e7e76036f9f4c013c8f2fb32f7fddba1f5ed049d5c9e04aab58fbf93aed74a34278fc905770aaf381 SHA512 7d32611ae1725f8eb2443aadaa9c23f5ed8e72fce06db75baf20098ec4f485104cba4e726748321d6f2b909cbd5b4bc6e10b8c08ad8bdb4931eafaaaf1d540b2
-EBUILD idna-2.9.ebuild 650 BLAKE2B b1b8ae78c2afc7f5d7d4a33da9cfbbac6c4bbda198bea4ee0d3f175dfef0f5e92141e373d5324322bc75a6de02c975f9bf16f45d0391bde9db5d05c7b571a4c4 SHA512 e0c3b77a5f02c1e706b04fb3827ab6d5f1901f2516f93c2b5d15c12fdc34451f1024c27346e852f9159196385944586ebcfe8aac9f9cf46f7605b0ef4b9d2b07
-MISC metadata.xml 367 BLAKE2B 363038f61cdb96780faecfb8c92d97d0cea8146d37374a731daa9618150b3f41c0bad724619d7bb353141834df9fcb88f075ece91a742ccca2da1621e5b8e2fc SHA512 50f13044fec18651463e6199826a39c7f28c783e7da389017e2dc2fd6f17b6c93e4e437a1019e0e31605a06a428c31a2fbc12744daa957cefbba2d76b511331e
+EBUILD idna-2.9.ebuild 641 BLAKE2B 47e15fc27ce9257455364799ef3f7ab2947559257866e404a2e9e4e28c16032cbb54ae47d0c9cf15f5338d98b402444695205fc4410ee9b3320ad1013741cf30 SHA512 0f09ff321413c13a831e04ff54bca648c008a0f08c79b1a82a451f7d4e6f1f9f23126082ba1ebff299c0a4b911a3ab728e550ed398c649f5db0137ffb9e30382
+MISC metadata.xml 392 BLAKE2B 3dc0422f56bcbb74b91e6366e35e0393e420321140b9589777e261b3169e837caffa3c6703306cdfc3f3d7d4e77a84b132650b17df485e02bce906992c49fbd0 SHA512 ac8113778dc4e03045ab53beeefacb748df94329289d09a2e49a0df6328c24b864be241e24377ce23173f9f7662f7fc18ce7e4a99e4b6a935db68ffb9fa958b7
diff --git a/dev-python/idna/idna-2.9.ebuild b/dev-python/idna/idna-2.9.ebuild
index 4a4a7f4a56eb..12c884cff34c 100644
--- a/dev-python/idna/idna-2.9.ebuild
+++ b/dev-python/idna/idna-2.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
distutils_enable_tests setup.py
diff --git a/dev-python/idna/metadata.xml b/dev-python/idna/metadata.xml
index 6ce490eacf0b..e46bff495f75 100644
--- a/dev-python/idna/metadata.xml
+++ b/dev-python/idna/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
idna
kjd/idna
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 93caac08c10e..61e138fde141 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -6,6 +6,6 @@ DIST importlib_metadata-1.7.0.tar.gz 29233 BLAKE2B a8cd97a384ab06201025fcbdc401f
EBUILD importlib_metadata-1.4.0.ebuild 1071 BLAKE2B 13d171a070a2b9c48a96c33e869a2efcc549cf1bcc137066fed60132dff4f557f4b856680f9b0b999464bcc1899608e039fb159e15ea2a53c9b9217995863018 SHA512 e5af262c03a8376c09581f1b17a35a712de9d82e8397db067db7415f73242fef147f490bb2bcab5b108bfd3a7e676a14ec5490e018d9d16010be9dab53c4013a
EBUILD importlib_metadata-1.5.0.ebuild 1108 BLAKE2B 2bfdc004450287617f23b183ac7bb52b46463b1894ad761294b2200d0de8244e00481372b7c5ba1fd3ea0472dcb1304bb29390f43b9d02ef07a44901f05dfd62 SHA512 267ad2f36025556162b81e3465b7eaf3baf383a06928b4799e044a309698c5e4196c0cd2483245fc45ee6d16fa930a1607789077fc1213b05826463a6363e828
EBUILD importlib_metadata-1.6.0-r1.ebuild 1229 BLAKE2B 3672433212a43e40b6d7021586e6f6a09954a6a38b785463ab39fb56612faf05952100afd7b9c79e991f303c505b6deee6bf0013a9e2861e53c7bae36e575df1 SHA512 55abc3d9561efcbce67f47cca55458b268faa147c468ff788a84d263bd5e3f20eef3ea607577418b382c3dc0ac596d16871283617d327d5bc67f9b0a2126506d
-EBUILD importlib_metadata-1.6.1.ebuild 1348 BLAKE2B 71fc748ea9c04ecfb4502e07d8c209c92ce779f7775b56881474ab278e27eb94faced2c9bf32cf1e4462503341125546f0b985739da0dad2225454fb94424544 SHA512 9831f6baa508bb87d7ddeb3b675633d423106acce24e7a9d5858dcc71c80605bd7fe16d82755a5f6c435fde54f4d6372080896a14b4371f8834f8bfd585c217b
+EBUILD importlib_metadata-1.6.1.ebuild 1342 BLAKE2B eddbb6f897648031115de1d34b350d67dc6a9dd3c76e14ad2c285b0d5df565c09a864d830af2d9c60d83bfe6bd1a5027ca5029362045de0bd0cb08112d5691c0 SHA512 6da8a9e87d8acd73342b93a06eeddf2a4def097a6a44ddce645d730129565bcb96027f68fa5e151e2d46d14b170e470b6b84cbbdda2f07e3bdab031f7c1b81c9
EBUILD importlib_metadata-1.7.0-r1.ebuild 1271 BLAKE2B bfbb0b7ca477f4d1734e0015646ee86b1e059ed36189de1d96689f3ac5a3b3c451f4fe1f6b5188a2cbdc81fe5c581eef5ace9a6afb88fd407698a8f8123266bb SHA512 8859ffe2661945376ef0d2e844f669e8849bfd3f5acc5fb5a807ca2ed533ad14ff8200316de0b5e76531d36574b418b61128d6f380a4b6fbfafab69546053ee8
-MISC metadata.xml 575 BLAKE2B fd32bd69ffa26679f44ae19012bf57e77219abea01918062e2290e48121209353d5a50eb2aa028ca8359b3c8f40a35c1cc4c48e2f05cb855a3016f2f01da41f2 SHA512 fdb2a87b50b50fd23d97c7dd9875958ad9ae6474f6e0a0e5fb8df12ed381c30e21a71ae2eaf3baf03ae1ab973c0c7827c8a84fa09c8ca52eb938439e4f66e17d
+MISC metadata.xml 599 BLAKE2B ce02ca578d2030d74c64bc05e83c8453dc4bc9efe83ae89860ef66e8f13da35961dfb73ba5aec3da5f12f91be9d15a4168bf93f45c7b942071b9418cb12aeb5b SHA512 f1c15874958ff4744838e06e2dd6f20349febc7d6f1939eaed3d698ea7ab552de18956f8dc3f57777ff0c82e26be1cb6bac325a9fde1b51b796fdabb2e7ae0e5
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
index 0982cef9a7c3..4bf756b762cc 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
RDEPEND="
dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_metadata/metadata.xml b/dev-python/importlib_metadata/metadata.xml
index 232d18f4ff02..94e019a67253 100644
--- a/dev-python/importlib_metadata/metadata.xml
+++ b/dev-python/importlib_metadata/metadata.xml
@@ -9,6 +9,7 @@
python@gentoo.org
Python
+
importlib-metadata
python-devs/importlib_metadata
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index ba714c97638a..7f78d50094c6 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,7 +1,9 @@
DIST ipykernel-5.1.4.tar.gz 108592 BLAKE2B 9e009bc2d251b065b1e6e72fd5dfb1aeace9fef094a72c76b96814923cefeb50b214032a125936536b34209e7a1e4b68fac270f9000862fcbafac2f270266916 SHA512 f9552526fece022192a90e4a263651cafe54a609424df578b0549cc663af9981e746a6132ff5e646c6a7b429335b92e7335272d7870affaa1a1846a4d39e09bd
DIST ipykernel-5.3.0.tar.gz 110977 BLAKE2B 4ca23618e25cc4ab4d6e1b0725136594d995eda91bd804611d1707c81437bfa0eef2b0995eb2697f28b119696d7493f6ec8e0c21e0cafb6e791a35438e8dd464 SHA512 c36a6dd4d9dfd52d31a8a37e10aea3c67a7a523ab32db8fb8904f4d90741056d946c265c57354be016d0fa1e4a34f4722c26798a3a7d6b6992884bdba8101190
DIST ipykernel-5.3.1.tar.gz 108046 BLAKE2B d9018487f6400e5be0a4ea1cce504ba312992480f7cf73ffa72f02d3ce7bea7c985ae16a5f6712dc5efb0f6c92a3bd91c6e1390200f404c70778010f1e1e2282 SHA512 c63bb78d188b47a6b748bb51cc88bd66eeab535bc8d5832e058b8eb5e9919401dac171d5b4d821ba48b7ba1c622f702c0c96ff8f56a07c2ba8b2ae0faed68869
+DIST ipykernel-5.3.2.tar.gz 108384 BLAKE2B f999735c04c1a4cddfe58761b22d079a79098049c6595aa5fc7b027404e2d01ce89395ed46eab007e0c1aa7a35b2c8c92c634c0110c011a5e18002044e9663d4 SHA512 26426c564bd725f8ba1ffcd112c1352a2b0068cdd34a994a17cee821d6ec14751c760db3a73e154b735d679d9f66e98c512c45d81c2eb22e26acc331f0f1e838
EBUILD ipykernel-5.1.4.ebuild 831 BLAKE2B 6e86274287543c6645ab4ad83175e6561bc6053ac54b6cf31ee397744c6eb8f74e03e897021ec1ba90cd5f2dc19a1ad643eaa06151bb41057b2664a24d0d7809 SHA512 b9d762eb0bfd0bdc0bb077cb234962f4b572c0e7e0e8befca4a3f0e0a99c6ed9c812028b0c15d4e178aafb0358090ea8be96f61b815ec53d4cc1c7f457442b8a
-EBUILD ipykernel-5.3.0.ebuild 834 BLAKE2B 4946c74da694b1d30f0287bcaa71c2cfa4acd8b516e53ce1040ce9903b116b9981e753fe7fb543a6604c9486f69e74ba8129759a05fcf831eb1c49806d9d6c53 SHA512 039bce41a7d824fe0a651d1ef44c1e035e3e6b4f34ae091aff305cb941f3f2a670ef3524cd64baa9bce0026f802f26ee57109cdffb3763600cc8e838ef27fb18
+EBUILD ipykernel-5.3.0.ebuild 833 BLAKE2B 93be8bc87a63fec15d858f03aa07affeaf3e6c11e82f526331cec3b01b3f30f7da3a1d93fa4a594d0d5cd37d3b43896080684961fc3b62af78dc60f65a889cdd SHA512 0150d124590793ba420cd21995da5f7d0738065bc28b3bca09496bd6112ecaa755ba57380ce12d8a01014f3bb075e3c3163c0a0f7f21bb6aa5b855f2b275f76d
EBUILD ipykernel-5.3.1.ebuild 834 BLAKE2B 4946c74da694b1d30f0287bcaa71c2cfa4acd8b516e53ce1040ce9903b116b9981e753fe7fb543a6604c9486f69e74ba8129759a05fcf831eb1c49806d9d6c53 SHA512 039bce41a7d824fe0a651d1ef44c1e035e3e6b4f34ae091aff305cb941f3f2a670ef3524cd64baa9bce0026f802f26ee57109cdffb3763600cc8e838ef27fb18
+EBUILD ipykernel-5.3.2.ebuild 834 BLAKE2B 4946c74da694b1d30f0287bcaa71c2cfa4acd8b516e53ce1040ce9903b116b9981e753fe7fb543a6604c9486f69e74ba8129759a05fcf831eb1c49806d9d6c53 SHA512 039bce41a7d824fe0a651d1ef44c1e035e3e6b4f34ae091aff305cb941f3f2a670ef3524cd64baa9bce0026f802f26ee57109cdffb3763600cc8e838ef27fb18
MISC metadata.xml 501 BLAKE2B 86da6845e84d32dc9571aef5828ed06703c942882a34b2392cf83d3cd2f59a01fd0d353445e67cbd45a9479ae1a8600a0c4dabf72f68eca0985d1f3423a146ee SHA512 2f8e8ee7fade5fb1c4b1065a1176cba942556bebb417824a900fca11e467ba6dc54a6ad4e49c0c0575bed769abf01fe52a9b6c0c090c7a530e8806226fa089a7
diff --git a/dev-python/ipykernel/ipykernel-5.3.0.ebuild b/dev-python/ipykernel/ipykernel-5.3.0.ebuild
index 5504b53c5963..0fc0e4a0f032 100644
--- a/dev-python/ipykernel/ipykernel-5.3.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/ipykernel/ipykernel-5.3.2.ebuild b/dev-python/ipykernel/ipykernel-5.3.2.ebuild
new file mode 100644
index 000000000000..5504b53c5963
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-5.3.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ >=dev-python/ipython-6[${PYTHON_USEDEP}]
+ dev-python/jupyter_client[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_core-4.6[${PYTHON_USEDEP}]
+ >=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
+ >=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+ dev-python/flaky[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 37ecb888118c..be61fc9113bd 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -2,5 +2,5 @@ AUX ipyparallel-6.2.3-disable-broken-test.patch 1063 BLAKE2B a80674390818474fba6
DIST ipyparallel-6.2.3.tar.gz 2371030 BLAKE2B 73f96bbed280def33ae243e592ecf2e298afe92287cf3a7edb966859c38c6dcb1f1a43082ab83907aa00e06d571f4b750df28e6885a1c2d1fd1489fd4472a7fc SHA512 ddf479a7776c2ca9fd37aa5b7dd402c136ce62a479333f5f56dce413649f9b928daed56c173ad5325268eaa58667d611257b20c8269899cc06ae2829f973b4c1
DIST ipyparallel-6.3.0.tar.gz 2380153 BLAKE2B b8312102e1d2b5fc963491ebe8530e2fd73e9f941f7912fbc72a8db51e7255f5cac95a853d15a57e384926ab1aff27f2a3ad13cc45130a8b612be5dc623538ab SHA512 fe621854b9cc3e5f88aeca2b06b63bb689dd2feee0da451a0a90800d8832f4b44b23bb9a15033029cc33179276f31e982a10fc7540e6d13b04f15d96c348a295
EBUILD ipyparallel-6.2.3.ebuild 1969 BLAKE2B dc93cc19091299c4b07e55a7068226e3239a5b3d4d32e2ddb15c1ff4a9cb6c6d6b572a5ca172cad3c59043e5c214e0c6f15dafb3d4303d8be70eb43047669028 SHA512 ef6dbefe4d827f5bd399d90a4b75a2be0b77d000c4973453dce17e26f59d45cb2a3afdae5964f2652e807079f23e6410aead5719fe54d218c6fd1b4d9ee277c4
-EBUILD ipyparallel-6.3.0.ebuild 1721 BLAKE2B bbfc1fa1db531de92835c5400ba27d150cb47e1d02a7eddaff11ed65bc5cffd8d055f9486d7ac68dc12e5c953e68fdf59ab709498feb6a70dae03fde6bc7a5f1 SHA512 778ed1bedc5a2a207dac83f5b08f3a66d9589f28cdda769a621e838b7afe74ba3d20faa1df770f59bbf452f71805b688bc641d6e2ba48cacc378ea5026729df3
+EBUILD ipyparallel-6.3.0.ebuild 1720 BLAKE2B 45b0b2c1f99bc057ed9102662a1c8aab86bc28e2d78a2722aa039ca65e6fb1d21d8ce75e3ff2cbcacd60ea5932aeef4a5b14965d74ce40cac6ddf1f9428c8e68 SHA512 5a3bea4d9580cdb7d8f8bf7ddb6a294a6bd79f416749c05630d6a6b55081f89ca3abec38bccf1d521ba6957cb9bf52ee1f563e270434f55f643e7106a9f5cbba
MISC metadata.xml 505 BLAKE2B 3dc8a7d01f8d67619f064ced47674ad386c81e625d46b820a7949dcba68755ecc69d29166880d80ba8951bd5226d6a380fdb0545287c527a133c3645b6f2bee5 SHA512 d86601139ae4a5d2aaf7d69fdfd609450f12d03775276bb0b459728712a15803d7c3a6ec3eb73ca7a0802e4333809f2eff8f9ebc2dd2a2c22947262b78c3dea6
diff --git a/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild b/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
index e567a97df1c1..dbac3af1a3f1 100644
--- a/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index dd5bf20959c8..6dd7c5eed9fd 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -3,6 +3,6 @@ DIST ipython-7.15.0.tar.gz 5245923 BLAKE2B 36c9712c72a38e918403cdc91fc098904282a
DIST ipython-7.16.1.tar.gz 5136303 BLAKE2B 9baf42c9befa50d78eec29d012aeae7f01886f29642a01845afd4a96d0efb7a4df5b14b68aeeb22d1d621e5427b219f717688a1d5074a6e70ad0509c7ca73a46 SHA512 60259fd6270b0355be67b4f620a58b56ae86e69e14debe2df86df6118548f2290ab3927b8dfab20db1ebd675df697d05eb6994b93625a7b8b6ea07112ddf63bd
DIST ipython-7.5.0.tar.gz 5118610 BLAKE2B 3f89babc292ea55724c2333076a673ef7fcd0a7a468e972a50c962194a71a0bc3cc9bdea4f96db4c21fe475b4d79dc87c124bcde53e1bc3ae7066a3c0c136e0d SHA512 564027879e53b3716ebe8cb1ed4b516835c15f326c865fd664aa7a4e5f26e1a78a329ff8e19d4acf6249e2acf7382501114cd2258c38bba89f0f382f7dcda09b
EBUILD ipython-7.15.0.ebuild 3624 BLAKE2B 12e457cb52c926d5a2ab169310365b17202e34f502f6b76c8c3b38fc0e5699e250060576877c384802f2408ee670532544dd455808bb2f02d52e31a5fd3299c2 SHA512 0506305565cbc67e701a6b80776bd48e67df26523f16d1d6cf5788c58d16854c4b2a6a59cb6419abe5a60b198fe707b6b1e8eaa030431ee0219a974a6f8e914e
-EBUILD ipython-7.16.1.ebuild 3624 BLAKE2B 12e457cb52c926d5a2ab169310365b17202e34f502f6b76c8c3b38fc0e5699e250060576877c384802f2408ee670532544dd455808bb2f02d52e31a5fd3299c2 SHA512 0506305565cbc67e701a6b80776bd48e67df26523f16d1d6cf5788c58d16854c4b2a6a59cb6419abe5a60b198fe707b6b1e8eaa030431ee0219a974a6f8e914e
+EBUILD ipython-7.16.1.ebuild 3650 BLAKE2B 1147992654f43943c2380bf8ecca2d32093ecdf98f980a282bffe7700c570316b9fb9b2142e80f54a684d58b7be86b3f379b045e5201c1fe7a18d7c10681ab0d SHA512 c0dd5c937f6b14663ac3138b576b9ebc3396e1015b6c388b42bed364a1c5aeb0b8db587dd0c639b5852f9b33ac9a21892149e21e9999367bc961352b9fdcfbf2
EBUILD ipython-7.5.0.ebuild 3571 BLAKE2B cc3f3e60012b2f432d94b12d46e51723e31905d7536467efc031ec130afe1460ff17eafa6ae8c601338714ca0a5862437dcc95919c85b54c2cb0892a6cac4dae SHA512 044290fe2202ed785ee10f8809475ab25c4dda5ab3d5de43d345860a809d5a7dc4a90bdd335d2d1ffbc7fb482179cca55d0981d3a63a8e6a567d342f3f151836
MISC metadata.xml 2857 BLAKE2B 89f6ea04a550e2e590f9e041c435fe578691118e24265d0f3c2465480cb32cbf4f5ca4d6c8fb2a08a665061347e19e361160f73aea080b1f67a4c9c743f6c23c SHA512 6b28c7f0be77e23656df143940074658a71ea872ba12238d3dc206f25662ddd589e3ebee11d5ca06498cfbbc651ae0effc95235feed91e853616706c87ca5bc4
diff --git a/dev-python/ipython/ipython-7.16.1.ebuild b/dev-python/ipython/ipython-7.16.1.ebuild
index 72cb41ac0a13..71bf966aa62a 100644
--- a/dev-python/ipython/ipython-7.16.1.ebuild
+++ b/dev-python/ipython/ipython-7.16.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
RESTRICT="!test? ( test )"
@@ -37,6 +37,7 @@ RDEPEND="${CDEPEND}
DEPEND="${CDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
+ app-text/dvipng[truetype]
>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
dev-python/nbformat[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/ipython_genutils/Manifest b/dev-python/ipython_genutils/Manifest
index a898abee9762..685c5baff3e8 100644
--- a/dev-python/ipython_genutils/Manifest
+++ b/dev-python/ipython_genutils/Manifest
@@ -1,4 +1,4 @@
DIST ipython_genutils-0.2.0.tar.gz 22208 BLAKE2B 1a898e11cec26787f530f72e2d2a79e7834664e0f6be6a27ddd426bc2d0b3f39ee46e9ea10ad03e01a08054873c9752007038e863d7dd9e501613a68e40e1635 SHA512 0e5a9f8be17d98dfb74ec77d1360ee79276a13fe1914e6d31e8740f06375ed1671c49356a77f118495f50823b8384c1e2c5b6fae73965e3d4249c831b9a2b095
-EBUILD ipython_genutils-0.2.0-r1.ebuild 423 BLAKE2B d1ba402f93c7cd54c8366bcdfc8da82914c93ec85716045a52ec8cf9c53e4521a4ef30b8b80ab59cf818dc4af841f8789ee65c7f228f7241e21336512c1eaf2e SHA512 8856839ec7522824452d315767e5c34754a81c704078a16e24da8893289d1506bdc25581d8e6e0d044b235ff7737fa0cbda27262b918af469db9ebf4f1a28ca5
+EBUILD ipython_genutils-0.2.0-r1.ebuild 421 BLAKE2B 7864aedee50a0b04a46ff74604be64ede8ba5ee767252af80cec92872520471c82c83af4eb4bf4adb6dc03aef3e1db9146b4feda2b422e899c21c7a0169055ec SHA512 f1b3b4e0931254801ed1f2de2885970613456da35f2e4e295f43afa70ab8efaca28dc0fd8404179a57489c54528424b60efe0f613a0ec20d0cd485f015af1725
EBUILD ipython_genutils-0.2.0.ebuild 633 BLAKE2B 487a65dd1025cb6e3672257b7d03d9606f8fe42aaf2366f3262e9db8f95092e0ea1c632a7a51a9a7ee6d7e3f455c197a8d68f9046ba0b5246813b423bc245e93 SHA512 2c1cf901f04ec51b506a942c2c85075f1c0bc352e87d7317a0af3abb294e54971fddfc49d171fdcb916a1a5b1c2d90e6ead17d22d00f7de8c09414fb1480b05c
MISC metadata.xml 836 BLAKE2B 4dea2105ba7319f4068c670e25ff874be86c94dd128997eb53e3909a4c20b741ad145b823bc6f5d543554fa69d386717d90dce7c5a5c4644daefb99cc615d95f SHA512 1508f1c25aedcd8128cb5caeca6aa1b344084fa635a3f1634a73eb7bddeb900ee6d6462650d954510f5d0ce23128b1473932fd487791cb68c33504b507dd78c1
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild
index bdcb7286b82d..7a9dc4c34428 100644
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
distutils_enable_tests nose
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 9c2542254591..3d40be5e7372 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -3,5 +3,5 @@ DIST ipywidgets-7.4.2.tar.gz 4114472 BLAKE2B 45f946da974c1f7c5422248bd5f2eacb92a
DIST ipywidgets-7.5.1.tar.gz 5656334 BLAKE2B 8bd98f523b619bea02e01ae5faffb08040dc5011905dd69510728b02736e66444b3c3cdf1e7272884c1df97f610aff790063f783e1d0939786669ef39cd1fc94 SHA512 856b3e4dad331766eff6e5f1fd31984a4b6ede5c678ffd51a4896f6448dac53ba181ccec2821f10e07e0f1095318427affe19f1420d0337bc3d37ef1e0a9ea0d
EBUILD ipywidgets-7.0.0.ebuild 862 BLAKE2B 16169cba0069af68b7dafed7b65a59c952d6797cbf8585f31e53708164a54f35a63b253d6909c3614384614447efd48f61891944a866e3a7345116f26f7df3de SHA512 02684dea29156423660f9f71884ba81ad0205901f05ad792f3cbe65e17c6a0ceaaea8a7ee689613ea55898e468669a3b9a53f655f94ae4bf1f68097c77b6c70d
EBUILD ipywidgets-7.4.2-r1.ebuild 781 BLAKE2B 71d7ce23fd5f1807faae85d54def0a2cfb045caa75bebf59cf6ed5c2758160908d82c73e8f669d7d00245536a69e584259f4de4d8c671a8d6a2911efcf3b396b SHA512 20b13a958d1e5ecabb77874dd410ee3033ec30fce1b1ec79c3c53b023e9796dbff151471f90ab25bd8a79ecda6cff9057a925b5315325e1073791fe99a0eb016
-EBUILD ipywidgets-7.5.1.ebuild 664 BLAKE2B 7af4580bb1b1d9ac9e850f514ca1a92cebc730cca6218e229d2342c4f1df81a6e9196bcf0a90a450048e904bb1a99d0c6bd08a40899a7cdccd758db3eb446e73 SHA512 1566a01de8959635ca069717af459715c29933d7d97fd586f85f5aa72050c7ce6081382ca1665471eaa522707b3efd05abceda1cba74476c2e2c37bb733f72a5
+EBUILD ipywidgets-7.5.1.ebuild 663 BLAKE2B 2df2155c3f9f2188d8f79b2cd5553264f9dce0f83f371fd4df903560f861aeabcd79bc7d5d32d028c8eda1d17c6f53e130bf6030fdfba1149ff53609b5a6ef66 SHA512 2f4667bfa75fdf0caa9eaed7a814f26cd8b0785ae78090e0278fbb9938e201a0fe3e8dcf6f4a5b0a85191e7bc91e89040c6c6ee800c8d2f5eceb94066eb5d9e9
MISC metadata.xml 536 BLAKE2B 885f71096220f3b226d03e8b44bfb31ccccf060a55c1de6634369d2570463912e19146577c10c0152ad0aac8c5d0a107317db1e2a2f705bc8a21efb6ac59a636 SHA512 2e7e02e4dbb0b2ef05216f597a14bca27af0526da6ec962da402e206ec5eb8a9b08174d52cf5d6d231c20c899a7e87a8f942c7cefb93dfa50eeab7bc65d61a05
diff --git a/dev-python/ipywidgets/ipywidgets-7.5.1.ebuild b/dev-python/ipywidgets/ipywidgets-7.5.1.ebuild
index 392387529694..322e5589332e 100644
--- a/dev-python/ipywidgets/ipywidgets-7.5.1.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 5ea47b9688f5..a2ab1c96acab 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -2,5 +2,5 @@ AUX isort-4.3.21_p1-tests.patch 1301 BLAKE2B c56ffa6dad9605def443bd1f714cd3a88e7
DIST isort-4.3.15.tar.gz 67949 BLAKE2B e78960518928cd74c15733bbc14bf066798ecbcc3e906754c10e352e7b88843451a1d0616d1b450100c77e95974f863951d640c9568277e867fcdfba8f44abdb SHA512 a5774d4f3c49c978e9043e52681e80011591422e60178d72074142725d9d7fa5065553686fd42bffe9e71b38b2b5bdaaa6f20e32cd8dbe33beb9431c397d78e5
DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164797a672b3faeb585a81fa0c86453fb0f1953b789661588cd0f04267a28837d46a88093a838391f752afa43e9f8b SHA512 fc2aa00c87196864864d2516b8be7acdedcf40d71d1931510e4b878dbd2b6da0b579661b50221f03f4aa5560c8bf23d5e1e10a2694d2b741ca09a92e40a4c687
EBUILD isort-4.3.15.ebuild 447 BLAKE2B 05640fd2f8789ab7457e0081519c72d6998623a61d6f5c8c6e2a7d2b7c7928949a578f283723d89c6a63f08e7d81670fba6f9be2905a033bab32a23dbcd35955 SHA512 b719b23a49a47897d115d38448ec3ca32a1f3e762113ac2f7b1e0493413afa2127599ff0282eec818ad914b15c9093055657870ac7e4d329a53428fe4087acce
-EBUILD isort-4.3.21_p2-r1.ebuild 822 BLAKE2B 5e91c9efc51a4157ed271620629ad495413bba2383bcf6d85f425d1c8c1a7eaa267eb86abeb21c43625d1db22ceb9da72c562d7127442f07a6aecf1b0c969d96 SHA512 69c01a6fdcbc86d0a28287d7badc7daffb0d9f448f4df4d977c0d4f1654e7f4685340252ee4989d6011aa47cf9b6871be3dfb7838790a61d980c85af56787140
+EBUILD isort-4.3.21_p2-r1.ebuild 821 BLAKE2B 3f3940ebddddf4e2febd47167f375ae4329eb4d90f2a1c61db733ed29fffafb5679208061b4234cb33c42f1539dbbc4e9e9c193e325cbb0186c6fc7ada67dd25 SHA512 1617de098a568c58eaadd072ac859b9dccf770261fe912d1765c8a0b8e716ac609e7aabcc80b9c9b2506b49504ed0e214ee49c679fc35fa0b43fab236bcff713
MISC metadata.xml 395 BLAKE2B 2fe78f812b341093dab53962f6c02a341b9c32221d3d318ce839f38ad2280369ca242f831cff95d18120a8104bd5cadfb1e77123872228411514a993b086772a SHA512 27076ca449e7effce88a4295218f20fcf89ba36ca0df51951f50d25b4f8b76945282136b6e972c0220567df3249c2c1fe2e956acfd36a5cf249401c88c721d4a
diff --git a/dev-python/isort/isort-4.3.21_p2-r1.ebuild b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
index ccbf059104a5..6086f5b770a6 100644
--- a/dev-python/isort/isort-4.3.21_p2-r1.ebuild
+++ b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
RDEPEND="
dev-python/pipfile[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index abfad83b7e30..964312f5994c 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,5 +1,5 @@
DIST jaraco-envs-1.0.1.tar.gz 8133 BLAKE2B 05ec6b0ea7532dcf6efe32fe7d1d6a1346d60294ed09743a6f7a47599406bb798f1250525b241aa24b971849f485f89440a56e8ca6b94b2f6847c48aab281be8 SHA512 df5aa3fe06be5091745697cb5f9dda6110fa60e1330515dddbb3e8441eb2232ba1036cfaef7ac8f054958c1a890601330b04b81a0887c4ebc6b41f29335df76b
DIST jaraco.envs-2.0.0.tar.gz 10018 BLAKE2B 8ad47fb7cb8f68081bba0e83368fe3a2f069130153b78be375a7a4543cf85e00ca1e365f9fb5a76d54f771879e87ff4737fe2991a9c520a9f86f21cf5d9aa8ce SHA512 f121c25ecce75beece7ed7218e69616f7cec6e493f9734b8ce040368d0fedc1ca4d7d343ba41c1367451a744f28ed98d9d2f3abc4610bfa8709fc29480c5ccbd
EBUILD jaraco-envs-1.0.1.ebuild 1226 BLAKE2B aa448531f05a3d5c6da92657403e47d36d3419eb78abf6e96c81ad46ebfd02eb59da86f48865888fa2fcd9cd9ac89957a8fe4d017ed65138c23953d384c553ee SHA512 8e23179efa415d71c77c746b597bb3cf6fb52a1fcd0b9cdcc53183c60313befa3713ff745cc12179604b05c9ce6e89c04dd1af0c8430b7688a64182a517c0396
-EBUILD jaraco-envs-2.0.0.ebuild 1038 BLAKE2B 57402728d5175ab58140341521a7a37a0003129295bcca9a108f8b6d6bfc7d4a90a6fc884f1cd31036bcdbbab9a93c0c49b72deab799b7f90fa43d4cdc0f462a SHA512 c93fbd8a2aa0b1443df2b4937b65aa4e03fd72d590d84d08a83a86d519a98d592a62167706bbc492bba7e8ba9f5d213b3e13ce5d4c20a8c8d3c1536bcc4889d4
-MISC metadata.xml 372 BLAKE2B 217b1b3b2a1884ca5bc3c4eea5ce22fb8d529f7b29fbf02870b5c9b88ed0e6aeb5dca1e88997fdda5d00f0bda6aa627f4195d51863dee3c93c93addc0d0025f1 SHA512 693e651230d179571ad77d6ad9fcf48a5b4bd2002b9d3b017ba6999538079ac10ccfd014542713d3ca5c438f127cb1b53d2ad04b1f137b353885e43bd4aea798
+EBUILD jaraco-envs-2.0.0.ebuild 1036 BLAKE2B 2714776a5bc41208bb8ec415dfb3e7a5bb5ccb4be549bb2d011fe64ebce7a4c81a24ce93e76cd6aeb5264b8fd4dbe119d8c61524fc8285867a60c4cfda7164e0 SHA512 1668256f3887bd8cbe1ed9236f9469fdb59f99030ccf27028a9dee782b17feeb2107682632191987114c7699d312c060942003b49e510427fffe4d0aaded0a61
+MISC metadata.xml 396 BLAKE2B e6dc26e54f94142429135696cc42201a0ccc3331a3e87cb3294bdae386b84a0f804bb91410294dd076badeae53d93b5da2158e8114aefdefbb91bd93ebb14ba6 SHA512 1456e135ae43a738ce79411b5040513a24acfadc4ea040cb93adcde5f61e6eed7c0798f42b32ce473d4bdc6563c755f5f4387f5e3cce350d557cc00a6efa899a
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
index 9ae4de05313d..a9ce4c046b87 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="dev-python/namespace-jaraco[${PYTHON_USEDEP}]
dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-envs/metadata.xml b/dev-python/jaraco-envs/metadata.xml
index c1264bf8cadf..ea0f511c6578 100644
--- a/dev-python/jaraco-envs/metadata.xml
+++ b/dev-python/jaraco-envs/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
jaraco.envs
jaraco/jaraco.envs
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index d36d7576f01c..6bc48469881d 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -8,6 +8,6 @@ DIST typeshed-jedi_v0.15.0.tar.gz 466890 BLAKE2B 7c4956c60646ecb7f21704e3ce95cd3
DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
EBUILD jedi-0.14.1.ebuild 1798 BLAKE2B cd722169171015689a62928eb680783cf13a52e121836e1f94f35d8b92016f72bd4788575535b6ac6621e3c4dde53aec7580c48c08a6605bd16e64281f5080d7 SHA512 3ff63cc5bf012f092604164937e920edbd82b7e16c777a61e62748d9f115af9e23e49f44f1e03d5d22217445f069348226cc20f5b900885fb721e145e8defa29
EBUILD jedi-0.15.2.ebuild 2551 BLAKE2B c83caa66e525448a6c619e6adb9af12223be980fd03581f8807f1c96ea919c4ef36fd7170964d2131037d60d7126621ee016503205117c16731d7a188e22fbfe SHA512 911472f0572cd581a2bd4b182a1fbaac6344fb33ed3e9a8e908ceea3a4ee5e1bac6663ccc199cd14452aaa10cf26d98fc01e4b6f325ce9a78d01c5696dd33a5f
-EBUILD jedi-0.17.0.ebuild 2128 BLAKE2B a5e1e2889bce86068fbe7407bed098d32c89ff735ff1498f78692aa430e66a5cd633379dbceb5baaeac3daf9fe0a31330f5b1142402fc1328801be3b5a3ac669 SHA512 6489b4bf7ae68fda13a3062e183a0a3063a1225ba914a8107c4371362fa1ef04b08ae2b967f927a03ac29024b2edc37c9957183dc10fab7c72923af575915b3f
+EBUILD jedi-0.17.0.ebuild 2124 BLAKE2B 8e04d4304d6972bb4f6842b5741212aeb11cf3961f84e29130cd4d0d2d260fe6f93bb1aa437a0720d4a17bc726d8d4242369fb7945b4e14b1cab59f3c9e766c4 SHA512 3f602b89acb956319bc86fa11877ba843ad55d4e5c7adcbf27d73947459eaa9f8fdec032a56f8055cf754a757d0a046e4fa4f20155e0d359529cf2f2f4160f19
EBUILD jedi-0.17.1.ebuild 2128 BLAKE2B 60c917667bc22722fceef83013626559f4d82ae11e47b5617195b68fd7fc693769a2d340c79ec9bbf24885c6e530091aeb5ac39238a6652e898277f602b1de3f SHA512 b3e17e5a1d984bee6aad5bc1727b71d03011cfaf82f5fb6e6974d512a7d399ef266b14791d6b0b0bb71e5e1c2df127a0d3f50b498325b2bab0148e3050f7ce18
MISC metadata.xml 400 BLAKE2B 7ae1b5a2edac295d8d1cce978fd3c6470eacd06b890c960c33c58050a5bebdfd091cbcf48190e2f6b3681341db155f36e9492f41a4c5d88b2f1ebaacd92ca15b SHA512 f3bd9785ed160ea3335a03139abf10e68d10d2431b4b6f56da12c9a074954ad70972e953b2d283646009af180b9a50e59adffd455adb2937905812a98146360c
diff --git a/dev-python/jedi/jedi-0.17.0.ebuild b/dev-python/jedi/jedi-0.17.0.ebuild
index e8e830ee68ec..4e89165f9f50 100644
--- a/dev-python/jedi/jedi-0.17.0.ebuild
+++ b/dev-python/jedi/jedi-0.17.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="MIT
test? ( Apache-2.0 )"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
RDEPEND=">=dev-python/parso-0.5.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index a22fdbf86e9e..542b8e446a92 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,5 +1,5 @@
DIST jinja-2.11.1.tar.gz 258637 BLAKE2B 80826397ada553b2bd1452f72430589ddebbd55aecffe6c6d9161ddcb46d9caa35635abd0946e063efda856391843831d25a7de91250d0f066b12cbf8b4af988 SHA512 66d9b7923f4b78133489bc28525d83032d37d5409ac572c00ea1aa342b3291bf0505c1e9d62f7a553553e26f06885e3d5c71bdcd2b334064b610692681694d33
DIST jinja-2.11.2.tar.gz 258055 BLAKE2B 5cf12d6c79e7e659b16318cb3dc483a276511192903469629ec497c10ba6cd023f5a834961ac74cbda556177aaac46f5045c5aaca3068dcef87017760895851c SHA512 453e0c94c57065ab78f997726256bd2a31bb79124a2ee17b632cb124a3ccefded33d81b35cac73497f095b1cd5d8cd4420d6932a637fd7c4cdb786f1753e49ac
EBUILD jinja-2.11.1.ebuild 1593 BLAKE2B 985628ee73cb5d5f89ff721e224e50f7fb8c19cfacfddc65991d68d25243268f68a90995b96d35c6bcce7913864cd5be832f1b5e5f3b23506a7938f4b3ae45ed SHA512 c3b8497e622f6685b65a7e3e4367b97d497b6a6331862fe6df945e8ff6eb94dd0e5214ee5157b123f4bb09ea7b3f3fb980e8da99b45b8f82b97acd097f57d75e
-EBUILD jinja-2.11.2.ebuild 1604 BLAKE2B d9a4baf03d89da438dd84856e12ffbfb67d9464fec304c3c81e881d22a2602894a138af62997f8b97de7c898485401ad228a0bce44865b04fd67505bd958d9a1 SHA512 055b10439711e9b8b34689b678915ede71f0467c3a3c806f9861480ef2999d05bf0c0995d970a62dc8a2f4c10a1626400a5707abd02353dd5ac8ffb8d49e918e
+EBUILD jinja-2.11.2.ebuild 1595 BLAKE2B f3118baec838306024c5fec6e313b38c95b9d8035c8c33bc84004da3919311295df4fa0194d8e76965e704c0814a6772e2fbd4638142b25fda154970d17773dd SHA512 5441b36ddd9ea467fdcce9333f254b89f8560926f2d570b107b6d162015400039c6dc1aac574372852a2d698453bc493e179c8ce28a34c7e0fc5c0ca36ad0ba8
MISC metadata.xml 466 BLAKE2B 89bbd7d238c94528f0ad8cca2fb358456f88403f06f517e71ca36ae63b01e8309a7ddda5c9063a01b90e8321445013ab5bc93ab33a1219e48b36a02f5ca23d60 SHA512 81af66b462fed2f8e9bfc8c3120e2e70dec933d0300a3d32264c73ce7606b6b3b375c4d4ed0c9f92ccb91c046c20ccfef17f1ed50a95844eccc3ee5baa0b56d0
diff --git a/dev-python/jinja/jinja-2.11.2.ebuild b/dev-python/jinja/jinja-2.11.2.ebuild
index b8c328818df0..d5bd0bcfa14c 100644
--- a/dev-python/jinja/jinja-2.11.2.ebuild
+++ b/dev-python/jinja/jinja-2.11.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
IUSE="examples"
RDEPEND="
diff --git a/dev-python/jsondiff/Manifest b/dev-python/jsondiff/Manifest
index 3ea3117ae293..58d5aed55b23 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1,5 +1,5 @@
DIST jsondiff-1.1.2.tar.gz 7803 BLAKE2B cbfcfdb2c6c3bb721b4db43aca1d66649257db2cd9feb9655015e621fcd90c72af087696b9553a10ac89cdaf5f23d8748463e1a13bdb19207e34e12e66629544 SHA512 ca96bb80a6f7a34c8c5bcde74856dc1c4935b3e2979330ecfc33432aff83968e671b2aaf310c77f2c7d431be1ae6e20a960879700ba3c903a09a48b23d4c0288
DIST jsondiff-1.2.0.tar.gz 15076 BLAKE2B 2d659598e6c647c8ea6622fc982808381e570c6ced23b5e77431b52e9fa746a5dbc743c739506362497d1f45dd2c290f23f459713ef31e927c05816e56659762 SHA512 5aa391ccc42d07330dfcf272b78aeb130f6f9033ca8b00cbea93549e32f07b98ea84cd6a1e61ab331da3de92838c69a501f95a9adb5f48e2eec46eb653264d55
EBUILD jsondiff-1.1.2.ebuild 836 BLAKE2B 4f6fbd241419838ac7fe9060bbb12599773409954b69b9d2c7720684638fdc01c4505301ac73eedbfcedbbc81c840b761c29c3f26c4906699e45729a36d0f580 SHA512 9342596313ffe7ad344460438a740402239c167e8b021eed6a80ab035a37ea4910da1ecc56e5f8f206349b3c08ebb1e07260cdb20636fcf6461a595658b1446f
-EBUILD jsondiff-1.2.0.ebuild 760 BLAKE2B d03972b3720bd457179c471dd0ebe6dc82d9e5e284eea81f181d14376f03ecf4cb469af56d9457e89b5323360661c33d1066907990c0548e8787bdaf22b33980 SHA512 7b86ab2ce8a73e177502cc4f5844c1df35d2388aa6e09fd945ad062307844badc03198fdafe178f0cedb2faeaa82838aa43430e515c05051a6593ee8275d05fb
+EBUILD jsondiff-1.2.0.ebuild 759 BLAKE2B 4e3c45bfc8b91033237363e4b9310bf0c542f93c790f006f5cf998394d1dfef9e0573a8519c51bd5d86dbe5c540ddcb815762360cc05a4808d6bcdf611232dfb SHA512 235d4a4f1f8dc1fe9e0be97f92e337b293c3865fdaf19d7fadcab16998e284865deac31fd71f9af77805bf3e84199dced6fb8c2741266409b43f5b68492df60d
MISC metadata.xml 435 BLAKE2B 3ea5af8e9063a07c6d3d93225a712395a351a368bf689e512b45e6225e23a543771839e756ee53cf51142b6309f0b1ecd20fff6203a69ae754c44893d09c5274 SHA512 d1b50f01a0a5f2381fe41e4da073fd00afd4443a76d692c7a2227e50b178e9b990c4c40b72d1beeeab7cc8e5f1a9a52beb758a5adbd088eb787b9f2d08844eff
diff --git a/dev-python/jsondiff/jsondiff-1.2.0.ebuild b/dev-python/jsondiff/jsondiff-1.2.0.ebuild
index bf249970d18f..1dac4eb00513 100644
--- a/dev-python/jsondiff/jsondiff-1.2.0.ebuild
+++ b/dev-python/jsondiff/jsondiff-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fzumstein/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
BDEPEND="
test? (
diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest
index ae30a3d070ec..07b240e74567 100644
--- a/dev-python/jsonrpclib/Manifest
+++ b/dev-python/jsonrpclib/Manifest
@@ -1,6 +1,6 @@
DIST jsonrpclib-0.4.0.tar.gz 57944 BLAKE2B 3458aee2dc27980ef93d7ae650f7d7485983598c8276f08b104a5b44d5dfb8f6225ba649dc7f6537fa66f6ba86d7082e11e23c7ca051c876a96d1b25efa4fa0e SHA512 357743e34447cd6dbe330c5adfa5541134a0ff8d82549ec47ed741ddf54a7aabb8cd417c501cb9ab814ce2cb90e1c2d4d4f21daac3b379f38be03c38a7ed198b
DIST jsonrpclib-0.4.1.tar.gz 58293 BLAKE2B 29beafb412402549d625efb2cbd00d75d70a9582a48eb9223d9b8f8778bf186a80936dfb35ad47186634aab862311e048d556958a4133d0f8461163a51ead4e2 SHA512 9e0c06c016a9e117bb0b8e0fa1dd9e472ef2e280ef5efee51d491f339c8792477430390918fc46a2d8bfbbbe4baa9d4289f67775b879d2a49a35fc7bd1e8ecaa
EBUILD jsonrpclib-0.4.0.ebuild 757 BLAKE2B 8d05f99d40a33ae49d891715d24c09abe566c185133646451e17f1c2806d8b83823af32ab49c46ac9d16e3efe71edc081b82bad35a93104430214760642eab21 SHA512 8d377c9ba2459590de3e45b60d9514213be1a9e93bb5d4e10160d1424340e59ff2662240e6802c92ddd3cb4c0a9bbbbd20fef8ea6182de712422e86cb9d6c394
-EBUILD jsonrpclib-0.4.1.ebuild 761 BLAKE2B 37ead202440067775ad9258bbcd85b866e8e3855a4072dd81a9e6ea823d8c00b1f14f07f049009e111cd0c5cb904be0ac393a66e88bd77a430e96e6e255aad44 SHA512 63082af9dc62a1e43114b1ffd4a1b98f84e3f81cc344394124ec765d5e065dbc3d7311cd3dca07e0f24c33458a877ccde76d340d041518f487976c6f12f73fee
+EBUILD jsonrpclib-0.4.1.ebuild 757 BLAKE2B 8d05f99d40a33ae49d891715d24c09abe566c185133646451e17f1c2806d8b83823af32ab49c46ac9d16e3efe71edc081b82bad35a93104430214760642eab21 SHA512 8d377c9ba2459590de3e45b60d9514213be1a9e93bb5d4e10160d1424340e59ff2662240e6802c92ddd3cb4c0a9bbbbd20fef8ea6182de712422e86cb9d6c394
EBUILD jsonrpclib-9999.ebuild 754 BLAKE2B 673ee6982603f06789bb9180006adc269ab05c00ed91af8a367e2adc705f1a45c0fa2424fafe44e9c4a741448f0ac5f44bc0d8502657188249d025911f7d7410 SHA512 3a7badfe2c8731311549a9634603024935e8503ede11ca42f4ac3371ad3f5eb4f7915faea463350575e33aff1c4d7749b5f618594373d962589e45839a42005b
-MISC metadata.xml 453 BLAKE2B 852b07f16a1773b07d2efebb8bb338c972a807fe2c7cb99fdfe62a2c6cdcb63098b9b76a2e9173af8f397ab5aea724732296882689fa42dd66381543d84246b8 SHA512 5ecbc0cc593546cfc7bb86cb789df99aa25e38c215971c35e0dab83d6134348f591db126f62f4a578728922b2aaad0d664b797edd85324b51c6b9e6ec0cd264e
+MISC metadata.xml 478 BLAKE2B 251f517c3f44194e274c9fff1bd653fbb960886a48fa2cede1be9caa1f3d592a57eb1374732b5bcc644753fdf00b2f21e39cb2a1318743242dae032c4004bf9e SHA512 62b40dbb4e594391c2e628d043df1361c9b41f7b162fa3ab533ff1a1839efdfd2501858e8f06325ef80d9a4af612f2df330f6184f5bd57ecce72cf56a8bfafe7
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.1.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.1.ebuild
index 3caeeb9a0089..da371501d210 100644
--- a/dev-python/jsonrpclib/jsonrpclib-0.4.1.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-0.4.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/tcalmant/jsonrpclib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+ KEYWORDS="amd64 arm arm64 ~mips x86"
fi
DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
diff --git a/dev-python/jsonrpclib/metadata.xml b/dev-python/jsonrpclib/metadata.xml
index 227e6b1f2cbe..1c7bba27c5da 100644
--- a/dev-python/jsonrpclib/metadata.xml
+++ b/dev-python/jsonrpclib/metadata.xml
@@ -9,6 +9,7 @@
python@gentoo.org
Python
+
tcalmant/jsonrpclib
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 079a82726c7d..923525143255 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -5,5 +5,5 @@ DIST jupyter_client-6.1.5.tar.gz 290829 BLAKE2B 7029703ebf7dccafd9c90835d9ed3305
EBUILD jupyter_client-5.2.3-r1.ebuild 832 BLAKE2B 1dc7d8971a00f3e0bd8aad14f7ffedab3d79a4a0b5f8132109f09a9c2d6704160302db777d7455643004337a886482175245e6ecac6876250a5260a1e8ee18fe SHA512 071de2eb4f843e0b0dd038d8de712b249d74d7ae15655b96e63b7c62f6e4df6ec89bddadb8d695e97644d64a06d21f4707e3285e52d5b8c865b23306413a4ffe
EBUILD jupyter_client-5.3.4.ebuild 901 BLAKE2B 0dc80a61a36695759ea808eb23f93c3ad7ae0263057edf6c0c394d94580a55d58bff18aac606aee59a2dfb5a4372f191ea246a9e2d887a2b3f5a1dd9b01a21f6 SHA512 9cdfeab5c44ce925b6f31f68aa970d7b149bda133c272e04fbb0c0c4bd933d399994c150942ae2d641e6631b54187247ad9def75aeb10e9609a9eddcb257aba1
EBUILD jupyter_client-6.1.3.ebuild 852 BLAKE2B 2c00067a4b8be34115e64df66b157574720406896ad6816f55a17e4442b15b327952d0a71fd9bdca30e0912779a6fb8d7f4b2adcabe438e511cb7d686bd1d416 SHA512 d81da4085da6a07520412c8b7dec6b0be0eaf5a00ece312412a9752e1c92c4184c1404d6edb32fd40efd8a74e77fc0ff3c0ae11641428c8acc017d1c5293780a
-EBUILD jupyter_client-6.1.5.ebuild 852 BLAKE2B 2c00067a4b8be34115e64df66b157574720406896ad6816f55a17e4442b15b327952d0a71fd9bdca30e0912779a6fb8d7f4b2adcabe438e511cb7d686bd1d416 SHA512 d81da4085da6a07520412c8b7dec6b0be0eaf5a00ece312412a9752e1c92c4184c1404d6edb32fd40efd8a74e77fc0ff3c0ae11641428c8acc017d1c5293780a
+EBUILD jupyter_client-6.1.5.ebuild 851 BLAKE2B 263dbc1be502d58f8ac7e78c08c14a56fe131b69256a1ab649ac667e1c04d9e8f76e9f8f661b29381bfc42c8bafa74fbcae831ce61dd1d842bdcc19760588321 SHA512 507cb5cb0cafcf756e4b0864f3477237be9075e0747a1f4e33bc0ed0045755a65c412bb3bebb092e3150ead4cee9673ca1fef8b915e8cfdbdad0e6415be0a797
MISC metadata.xml 779 BLAKE2B 43107b0b7e5e1316a386e41e99c482dd13eb753bcaeebf6b496d7b432b69aaee01f6777877033154b178b17bbef87cb019d4fc55302e089c69972ec7dd412c59 SHA512 4333a7a7ae831d4f12b09d3f78fea784c508ed1de502b71d5279c6574cec7808e0e13e0e9b59d3b6048788d406f617a883f753204eaa22c24218587e3e4fd610
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.5.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.5.ebuild
index 2bf01c589f1a..e4d74cc06dec 100644
--- a/dev-python/jupyter_client/jupyter_client-6.1.5.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-6.1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 40288d54c967..76c9ed7573b9 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,5 +1,5 @@
DIST jupyter_core-4.6.1.tar.gz 66693 BLAKE2B f4338a015ac4b3e0a7cd2497a660bfca0deb96ffa2371fa9c72656f8a68b6f80fe5d494be79c8fdccbcb51f3d9122fd7d4b3e36864d38e7da1c5029c6b1aa24d SHA512 baf0c5db4f78a3cee83940ace80b48ba308c47eeafcf584120b8ba82768c15448fb789ec5b9ac8d541cbd1bfdd47a988f79130675c5943a67d3135d428b43cbe
DIST jupyter_core-4.6.3.tar.gz 67305 BLAKE2B 7c6a32bd8ce773b7bc4156eabf75597112716632179736b19be4b0e73eba7c5c67a0c9d2d141b952d72b68aff826227b0004a3bc9f3b286b68eb1375f2316bdb SHA512 3c7370c24a4cf53c9747e9e411852d207c0c7035809dab7cb018ccb53e19208df25ad4f728531e47f3a42c4d9694c3e1ed7b03133de23bcbdeb346c319f5f51f
EBUILD jupyter_core-4.6.1-r1.ebuild 1077 BLAKE2B 811c274e81f9e8b5ffa2b13f9320879c3bcab774daba8c066f5d85bdf3e2ad58a6b165495ecc69c8db44f3e8bb7e86b28d80d8af0da1bfda98abde3841d2321d SHA512 19633ae6f33235f194379e8795a5af0602e4486917b4b9ceab6b170a45a23e640875961f0db0c1090a59b6436fa6b74565f48999e4c99599e0401e5e20e02892
-EBUILD jupyter_core-4.6.3.ebuild 823 BLAKE2B 7b497e6acabff002ccdf8d5b6926db693fc800ffb79d9a4114dce6ed438b4ffea1d5204880acfee7b020256e01653af550f72330b38b0285a657ea2919ee1bf8 SHA512 df825e9d1554647c86a087818df08b64091db134872bd78dc9df80bfc7f72af7912f9c29b747cae8a09c1cba22cdc218e0764e78cdc7e3aff8c431a60aeca656
+EBUILD jupyter_core-4.6.3.ebuild 822 BLAKE2B b98d0f593378cf4d91cff246e2a6b976bc70e72ffa57bfa190c0fdf16691149fe24f5d1ed3c7ee7eac18d57e7d519ae6221a50b30dfb88f97e4c6faa580d4c2d SHA512 9751dffc79232c95173c4aca9413895312d7eec655ce696acc9db0fa38d591eaae3d6ae719805d7c3e8c21ea414cd309f8e66b2c535295e41c73fd4988f13d91
MISC metadata.xml 733 BLAKE2B 1ac253b8e7dedbbb5291296d40d16280514f3a12fd3c905d32690cdefebb1844e60cd0ab516d04feb8a947f32a86ec4f2813c3edb2dc48638c734fb207adf825 SHA512 e180aa5a798b8e7fac09d83f7125058ece7e2ed9be722de31616f09408e46d87153c88345615af2d4691f155ea3999b4d83c4c6e21360068af469181ce13bef8
diff --git a/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild b/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild
index 0891fa649da7..89e88b637738 100644
--- a/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
BDEPEND="
diff --git a/dev-python/kazoo/Manifest b/dev-python/kazoo/Manifest
index 0c4216c0a13f..0b7270198ac3 100644
--- a/dev-python/kazoo/Manifest
+++ b/dev-python/kazoo/Manifest
@@ -1,5 +1,5 @@
DIST kazoo-2.6.1.tar.gz 157425 BLAKE2B af05ee5fb1d532ebc3352de004062f1ff976825f564212f2db76efc153566106ffa520745a8e8cc6a78ca2bf0d17556f978a6b462e4153e9b3ee5258e78a1d82 SHA512 613e8271bfd6c8f5ee976b6ee460478c7faad46b32995125a64312208b38755888690cd46b913ff44ba52aeb36de3ec3dd8e222985af77e99f43963a3eb48d48
DIST kazoo-2.7.0.tar.gz 163552 BLAKE2B d117ef62b324d074afae5d17f12e2740ab26076ce8e9ea5b0ec15400d2a57ac89053c92675c7e82f1b54e33d30d6029765ec29a72ad537b5d5cfdca976803b5b SHA512 04c3acef723ce306537114ed0f67e96d6c4c638d5dad12e38fcbf1b4dc3e7a972ca0c950adfbbbec7deb8da910e03e867e26ccb83d39eb1381daf0cb5dd2ac6b
EBUILD kazoo-2.6.1.ebuild 1215 BLAKE2B e5c07c8f5101d32555d79865687af23cd1fd64ee201fc56be1a2a9f68a7d8880b98836da2dbc195d05c0b240dab184fab3dbe104bb975b151a338de618bb689e SHA512 1e5ea79ec2afbef232b36a0b6a5cd807e86e86905c1dd40644254816d8c9f7746ef416a47aceb8ca0689fbc7501e4b41d76aacf06f3b224baea4e4d1108c7774
-EBUILD kazoo-2.7.0.ebuild 1217 BLAKE2B e79635c0c2ba16963c7899b73e8f4e960e294ad3729666d0961e031fcbbb7f50edd226d8d05e49e0b6a8f9c3b92ea7f7e4e79375113db932916cc732b91bb899 SHA512 549767e5b8492faae8688722cfabc7192652e358e11fa30c772b2e7f979e34140d80f2e8cbc1487d07759b9dcfc0f64fee67621a28e07cc2d8a2787bd06113bb
+EBUILD kazoo-2.7.0.ebuild 1216 BLAKE2B df997fdc91aba0242994cb65f4ac3255c60c730b676b6fa90d88090d24a6bb90c42806d0ee84fa722c1d5bf7eb5cf6e6955cf0a92f6dfcf3af68c841f3c1871c SHA512 4be46d842cea6be44b0f64831cf7f39f60d7dd6ffaa43ca26abd597c2a4064f6dd182a2b45e6d2712548ff8f5a3f9976072f35028daf5b651e6f1d402e65aba0
MISC metadata.xml 379 BLAKE2B 4cd47b54e2c56abaa610aea46ff71e832e573fa0938085e0aab255d5e518a72705d019f4dbcbd41fb581773756c0c67764815cb61c56e25a8cbe029e5159a3ef SHA512 cb94df5977e6629916f02303ea83da8d0d556d23c7c2e0fd17c65ed88bce35d7f42d5e9649eba86dc62e222f1bf6aa8d9f65f839c37ef4188a70f18a607bba0e
diff --git a/dev-python/kazoo/kazoo-2.7.0.ebuild b/dev-python/kazoo/kazoo-2.7.0.ebuild
index 5dc5703f6694..b167822b6f59 100644
--- a/dev-python/kazoo/kazoo-2.7.0.ebuild
+++ b/dev-python/kazoo/kazoo-2.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
IUSE="doc test"
RDEPEND="
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 0ab0a218c9e1..ef913c476664 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -3,5 +3,5 @@ AUX keyring-19.3.0-tests.patch 939 BLAKE2B 8537c22ba56a24e5f8fee3907023098dbbdaf
DIST keyring-19.3.0.tar.gz 43587 BLAKE2B a1003aa55ac48f39e84431c50fe3e24e1da76a0db177eed08bd2c2110b78d10cbfcf7188519435732be68452a0318119cca1563168410b16fc529a3a7e98125c SHA512 b1d26f665203b11712ef91057ecd78cce58b35038b259605c42997283f6c41449baf242ecf43510b29598559b8aecf733eb66be6e0c439564256f40eb0f6982c
DIST keyring-21.2.1.tar.gz 45535 BLAKE2B b276f5b973c418794561e0d0872761847d4cb81531dde61b75439c73039f49ffc8abf679d622a9381bc6663ffc452c8b6aabc0a4c8e4cfe5ad1c63566b78082d SHA512 35869e37b234d15799907f0efd0193ab3eb9c0799a6da2d843fdad24212b4ab983658b32bd8b09b658174dcb1ddb6d70a85d0af95730d34d8c571f2ecc9a7c8b
EBUILD keyring-19.3.0.ebuild 1643 BLAKE2B c902a24962b88f11287b55e957a10c50410dead3a252d0827edb6bb72747b7e0686a896b93be67aac3e60f066ace99addc3f798a853d69374b6761b4b54019a9 SHA512 5ef0899592a3284f2a05de1a66b846532af35de7143a5f57b7933dad689cd1a2b94de5b83ca0038a8288c402ddb71ba538eb0f48885496a986f221aea30c5e78
-EBUILD keyring-21.2.1.ebuild 1274 BLAKE2B 09ce045944478da8ded1c129c1510166a28910be93cbf1f1f5efa0b6f22d07f08395e123d1b0a2cb78cf1af43ff9a0eaf1d747e9e3c8e49950b77e6f709bc58c SHA512 0a6cf495b4bfd7da9d4be1fa471bb6ea2f1890552289fd1959dd809799f23bf541f3dbca0c15a6ae7a1e41688cdf532232bfd884700a7b29286e6b01944df7f0
-MISC metadata.xml 652 BLAKE2B 7b1d1ad76e12349a4b18514812900a0847e43339299997512aaccf1f8646b6f1197a81d89fc1d43daf3a0ae0a65d635087222456bd317eb52c6cdd76be027327 SHA512 cbc87333b3907d4e210a49f566ef9ad8062801f8fb4c36951b4fc72c85f7e411c1919db71082768730c45338d6dcb1d907b5d1a7e1c5288782457cb942677a37
+EBUILD keyring-21.2.1.ebuild 1272 BLAKE2B 64eb8a86db7c1a2b0b5e7f7f1859c14a9b3ba8464a7d47b5cbc3c5261e88e03b5ad3fcc52b23ad951595ac51441c09c1e56b01127ca2aedc36e0df59bd3dbf24 SHA512 f6b5c2f917bc35c1d03d27557e8e5fb355bc3271c3330c7951062ec54f898bdcdc534babecc2cfe7407b4bf5aaf2106ea542eae6b88aec4dab31a2f1a72e76dd
+MISC metadata.xml 676 BLAKE2B 147213a7e4221fae52a5add4bea8e41f5ca6f3e5c8e5008679ebacb863c9f9286217212bd910eceeed0bdc01c6a182c1aa8fd655e5ada71765a5ad31e23f388f SHA512 389b65715442d9601149fad087e034400df4f01e698f7d2aca350c41a4efab4574bf01aa322822a2313d5d2af8be4027878b7ec1180e4fb1d60bf5404e3f2331
diff --git a/dev-python/keyring/keyring-21.2.1.ebuild b/dev-python/keyring/keyring-21.2.1.ebuild
index 31150c3125ee..2e3c808a6783 100644
--- a/dev-python/keyring/keyring-21.2.1.ebuild
+++ b/dev-python/keyring/keyring-21.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="doc"
RDEPEND="
diff --git a/dev-python/keyring/metadata.xml b/dev-python/keyring/metadata.xml
index ff28974cc0c1..dfb0a320cb7d 100644
--- a/dev-python/keyring/metadata.xml
+++ b/dev-python/keyring/metadata.xml
@@ -13,6 +13,7 @@
python@gentoo.org
Python
+
keyring
kang/python-keyring-lib
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 8a9ab82b69ce..9b49ec5a55b9 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,11 +2,15 @@ DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c894
DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
+DIST llvmorg-10.0.1-rc3.tar.gz 120876192 BLAKE2B c48c7e00b37adaab411a34196b87eb630a997ce56bcc33350a698d6d8e24877844b037735ec44abf80ac4c0a4d5a8682745afce4c44cb806bbe9e2a74d875da1 SHA512 ccb6a5bff336924381def11cdfa9c676351461e293b6250b15c1c6cd7694b99beb3e2f3834e8321a28586da091492cbde689213eb4108c9dbe86724e1ee66949
+DIST llvmorg-10.0.1-rc4.tar.gz 120873659 BLAKE2B 2413fb8af98384e608fab83b91fa826ffe2a7cdeb052eb6a50f253f9fe46ee71c040f210bb2f395d73b0a2772854ccafe2ac2cf1cc7c8405bc988183fa732aea SHA512 8b3f0b794c98956238e5d3d195e3a9cb9c9a40f78e2ed72c767fbeac3e1dbae58cb8132db7d2c8caa891a4d0bf631e2a9afc67f3c37707e9e6b94e2f9aeb77b8
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
EBUILD lit-10.0.0.ebuild 876 BLAKE2B 472d6edeebffca628159db98b58cf095bbd227b73afecb4004fe81880b76e209cae5f95b81d14ddafaa823e89f91b0cb3f1ee9060bb0621b71d052acd9171b5e SHA512 0c1cef983950daefdb494465431aa774856c3f35774db3760d437dfbaca547635b6d11ab0f4c54d11c10ee39b740d38a6ca5d5b75f994711fb8fc60ebbe07ea5
EBUILD lit-10.0.1.9999.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
EBUILD lit-10.0.1_rc1.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
EBUILD lit-10.0.1_rc2.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
+EBUILD lit-10.0.1_rc3.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
+EBUILD lit-10.0.1_rc4.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
EBUILD lit-11.0.0.9999.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
EBUILD lit-8.0.1.ebuild 1022 BLAKE2B 8a84bd40ba13ff7a42357bb8a94c4589c3127f9601ca9ccd099f2ab0387319c4487a77bb1972499563e505f0ea8ffaaeb3c3952f3e1ff9a2cc63f04868ec074a SHA512 76a11a6df5516b37723818a956461f6dd303027de1f50321b581636e35c1704711266f3d2721e6846d9525bb0aed347273ce16baed2561c61be9085221fd0993
EBUILD lit-9.0.1.ebuild 871 BLAKE2B 58a0933e8024a1dd2cf8cd09d08c3730e42a4c4480db7ac97eeb84569871df33156eda941c2965a1170be9eac7ac28950149e811d7cb75317b6b3fc6058bec8f SHA512 3d9e4a1f3348e215e9551cd7e419fdbc266a880d3ece2d0127eac5165f4b7f3089de7c188d4476666bcb525c50a8e5aff8ab4c8094b2f7aa233a4f0ea2e93e3d
diff --git a/dev-python/lit/lit-10.0.1_rc3.ebuild b/dev-python/lit/lit-10.0.1_rc3.ebuild
new file mode 100644
index 000000000000..b9123ef7bf14
--- /dev/null
+++ b/dev-python/lit/lit-10.0.1_rc3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+ test? (
+ dev-python/psutil[${PYTHON_USEDEP}]
+ sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+ cd "${WORKDIR}" || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local -x LIT_PRESERVES_TMP=1
+ local litflags=$(get_lit_flags)
+ ./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/lit/lit-10.0.1_rc4.ebuild b/dev-python/lit/lit-10.0.1_rc4.ebuild
new file mode 100644
index 000000000000..b9123ef7bf14
--- /dev/null
+++ b/dev-python/lit/lit-10.0.1_rc4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+ test? (
+ dev-python/psutil[${PYTHON_USEDEP}]
+ sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+ cd "${WORKDIR}" || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local -x LIT_PRESERVES_TMP=1
+ local litflags=$(get_lit_flags)
+ ./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index 93e97e38f631..34f8df5725c2 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -2,5 +2,5 @@ AUX llfuse-1.3.5-cflags.patch 662 BLAKE2B 39e0c35ffbb62b4a6b7b7c5592da8c87554ea7
DIST llfuse-1.3.5.tar.bz2 362266 BLAKE2B 561439e193470c047aa32b5b4ffd189beca2496b0141d9f0b0d4b494ee135025b174744ac3c90a0e5e8a17cc98f4ab2e8b4a9069f7d73e01a369f5013d036144 SHA512 d45c5fe7e81fd561e016fe99cc7bbac0cf6243e1517e992fe5b302b641aa93c8f95779cb7a4add7a7479f1ed6ca35e0fcf1e4da0fc46ee5d819b46511927613c
DIST llfuse-1.3.6.tar.bz2 361750 BLAKE2B 74387a6aeb28c3f49234a4f430c3f2aaeefa2057d69e681405d9588c63b3a6e4a6daa58b8996541825c73ff4dabc5607874c2d7885586d793a6436e3f680aec2 SHA512 d67e39daf65c92ebb5bf69abb0c5dc3a88460228b5ec5ee762a11fc909369562411297e8ff9f512ee1ef539d8abec765924be581703fb7e99963c6512cb1f0bd
EBUILD llfuse-1.3.5.ebuild 912 BLAKE2B bdb568bf00c3c4f6ec5188ef0258930ae8f07e715a7683d70435238d5ecbbed06f838d02a7db13411546a794669dcde1d8e25179b0ed2f60f4858b12b9588957 SHA512 603f7a3c9abd584eb1469ecbb4356ba1bfbd30fde9c0fe28e23f37969df73865012601bfc6f019c666050dd8c6b2193b3075484d626b5edb66d2afcbe0069841
-EBUILD llfuse-1.3.6.ebuild 757 BLAKE2B b2263e1f5cb66433d656f83895380d25e8ec5be0daf2f81658c0e69156cfeeae458a86840c9f040d55382142693ec6781ae2c6abbcb7a8b5ffec576b1575f4ea SHA512 44b17f34d0a2c1585b78e837f0557c751feaac0eb873100dd7932928f6e698a8e6f8379ba52228128dce6b4472f6888cb867bc6f73277794def1bae07ad4d0c7
+EBUILD llfuse-1.3.6.ebuild 756 BLAKE2B 471832db1ce533ebe7bc576b26c6b4302e80253f157b2d7fcdc9dbb507c3789458a636c6a6dac8a76758a496423b90e68f5fa64d6542f1d28e4d6557ba779ca6 SHA512 38d81841e11835e673bccc55627518861dd53648180e9f94facabd6deb0fb65b294f4427fb4c6f14f3e211fb1c7129a1289adc626cc3cb9839cffe222a210a75
MISC metadata.xml 376 BLAKE2B 1af93242bcb6260813d1bfd9ea8705cd5aad5bd6832dc99d49b1ad3cff9ab85c59fa7e2fd713f3a30055d8e5a1c507b12a3cb8324c661062490eab6fb04f280d SHA512 f3283b1b857582140d4bda3c2456889e23e7c82d8a95efd9d9dabc18c49c4c37f160ffe082932eecc738d7b045f4c6607b09a89f0e8c414e0329834fd7588fbe
diff --git a/dev-python/llfuse/llfuse-1.3.6.ebuild b/dev-python/llfuse/llfuse-1.3.6.ebuild
index 4b56e688f41f..962b4cdbe2c2 100644
--- a/dev-python/llfuse/llfuse-1.3.6.ebuild
+++ b/dev-python/llfuse/llfuse-1.3.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
IUSE="doc examples"
RDEPEND="
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 9b51476c30dd..aef8e473de94 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -7,6 +7,6 @@ DIST llvmlite-0.33.0.gh.tar.gz 196450 BLAKE2B 3b1842b53eabf5cbc30aa642e12d214bd0
EBUILD llvmlite-0.29.0.ebuild 1451 BLAKE2B 0b5f4787b0ebd81640f9b71ce15b2ae93d14777ef20ae2cfee01b24cd1f22c125581759776ad0289d4581492b60be229f27a0e69e1f195c8af5fad719e1b77c2 SHA512 67dcd7ae4afc3b72fefa2484c7392d621866f7cad0fcba4c2f5732baf3f7c5be7f4af036e425167aab02acc366033ff87cbe87463a42ded54b8c85bc3a14ea17
EBUILD llvmlite-0.30.0.ebuild 1455 BLAKE2B 16be8211b855c6ca41cd7fd86caebfecfe528c0fb9329b247b889aa6a4bbbbe0f67aa2a6548c9c951bd868820e0c98346aef663ccf9c2b2a4deb707f92237f87 SHA512 7d2fb4b689d6a1eccc89051d1beaf827ee18d271746b877c0bc95695ab373bc9aea9421ecdfaa31832a916676deb33863e0c515755593486c9032162733c8909
EBUILD llvmlite-0.32.1.ebuild 1608 BLAKE2B 2f588519db4c9def2d1bff835cec129fc90a16ca4e9196172d319dae75ecb9331696d591338f80f5e1ec2be6e9374e1be4535a336b71329309c1119dade752f9 SHA512 21e7f355dfa1835cc64849a29fc37bcd2cc46354a25b524e770a0d0083db98f66ed8a7c911c7476b974c46229dcc18046df568440cdd43e190ddc8752475253f
-EBUILD llvmlite-0.33.0-r1.ebuild 1655 BLAKE2B 1770b375b9d01fbfc50d939ea0c44a67243e301bacefe7fd58c45937cc16887dfebea2811a5607515b4f6439d6eeb00061482768c234bfefe328760bb7f64656 SHA512 38c39ec06953791cd24096dd7969d83524d195f3c2cbc913540057a6fcfe853083f60d63b50476c170488c64d6e658abab4f54c4f4492682368ad613b97d07e6
+EBUILD llvmlite-0.33.0-r1.ebuild 1654 BLAKE2B 1990c71cef90b6c4be22830db31e45bb61f1f3fa0c9d25c267be1ddcb72723dd18f76c68c725ce1fe9b3a3ed6bf338d96fd7d83878fd491c8ddbbfbf9ca08aa5 SHA512 10431950e6c815a4025c41d3cd8dd58a629367df68200c477c07b149a594f51dec15367d6defbd2a9220188e4e02046f24799b8da33d45b47b200c3f248e11e5
EBUILD llvmlite-0.33.0.ebuild 1607 BLAKE2B ab085835ea02ccc0729079da07089428625f9e5a196886406facf49cd7cf80614ce71acc9e9b7ee11e24d8518b1adb4250561fd84d3e4742ce93e4ccaf79aa54 SHA512 d24723298c85bf17f218595e0515b168de3157693370a00083cb57473202677ca87909013c5e9274d710d14c0f3473c3ae6de96f404f5a219dbc308efdc3af8a
MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.33.0-r1.ebuild b/dev-python/llvmlite/llvmlite-0.33.0-r1.ebuild
index 5b5f7d1db25e..985351846cd3 100644
--- a/dev-python/llvmlite/llvmlite-0.33.0-r1.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.33.0-r1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples"
LLVM_MAX_SLOT=10
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index b31f93e8e14e..910ebcccbc52 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -4,5 +4,5 @@ AUX lxml-4.5.1-py39.patch 17992 BLAKE2B 17855768819d42b0b67f9a66c5cb1661b71385fb
DIST lxml-4.5.0.tar.gz 942013 BLAKE2B 24535fb74c58baff26c47c4bfe4ade0155044b30d099f1990c11406eca34e6bb8255631e5b30172adcf95fc61d1ab9d0384dbf9910c7694beed11cbb99595008 SHA512 b4b4692cffb7b8d074e72033711e17df2529d0747c4d086926855bb5a39478e7aea2bc195d201ca3c252822b231dbe47aaedc647e50bbd6b24754668beaa60ca
DIST lxml-4.5.1.tar.gz 942377 BLAKE2B 3b7434b50d7f81628f17adf0c65e38c826304674495160a216c3051d86ddd9924f2854cf35453ba8270ca461c4c5429698a002853642f9e52206de1443c6b6f0 SHA512 0f16cdcb8aa7f8c98d3fb625d6713b422c14f0d4e7348cda38eb0776f0cfa637faaabc14dc63f8052f2741c908de6f71cfcb6471d5286c09780816b46cbfb439
EBUILD lxml-4.5.0.ebuild 2288 BLAKE2B d0757aff6f274f389a9c2356077581583e740ef177136f0e18dda34a8835c6e003d5537462d9a33caed61fa4c5223bd618d767d004175e5fa7c3a9a1231b9a27 SHA512 bc668896bdf781245d9ffdb51e98e47a15a816e1abb188c519473f5c920f3630c1a6e9b72eb5c7bec232864cfd12b0d47f8876dc01f3a793271b4561f7981502
-EBUILD lxml-4.5.1.ebuild 2289 BLAKE2B 93c41c346ba66dece63e747c7db8232ac4d60bdb5ea473d19cbb6c0de6bcb725518757387829a8ebc9ad931c2b45efeeaf0cb5c4f6f97af58bf01dab499b8032 SHA512 66d3d913164f1a5818f05d9218c51247646d46aacef6b73107c300a492bfc65f313be62560bb10826c0a795dd3d9cbbdd85d98630e14bb4efb99ae6ce4b60fb5
+EBUILD lxml-4.5.1.ebuild 2282 BLAKE2B 85e918545306a5313311f1299bc69803fefe41f76c028c78a99e79dd22f71db76a844e9580cef59fd5f1c11d46ba1b1598df5c65a1b13639fd5911ea651d568c SHA512 c8628538cb430ca2791e785b62070a78b22c0450f8c815003e477c82f9d06456639e329981a66d593d0bf6dcd5cc3bc76de7ebbcac04d96eff54b2e54edd0161
MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.5.1.ebuild b/dev-python/lxml/lxml-4.5.1.ebuild
index 076c86886dde..c1dcbd66e0fb 100644
--- a/dev-python/lxml/lxml-4.5.1.ebuild
+++ b/dev-python/lxml/lxml-4.5.1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
LICENSE="BSD ElementTree GPL-2 PSF-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples +threads test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest
index bb5a8315efa9..9888db82e5e5 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -5,5 +5,5 @@ DIST lz4-2.1.6.tar.gz 129066 BLAKE2B 1a739c54946150441ddd4025b4ce8bf79a718d64a71
DIST lz4-3.0.2.tar.gz 152443 BLAKE2B 3bf452b5b5ee65caed13b21fd7c39f32ccdea18e6d900facf74e3271868299a2da258b2b0058efaea12a3b42006f0ad0d17004692c95be951c173fee1a1162be SHA512 c31116ee3cd70241b19bff6c59d1852d4c26ad5f0c9a56cd2ecec58e8c2751773162c7ac6a2d887e8cf537bc869ed8866929164f976849efa3ea041eacc4535a
EBUILD lz4-0.8.2.ebuild 819 BLAKE2B 468e9437f0b7a337e990e5fccc1087ba475767c82f7000940e8b01ce46a4644fd620c392e48cb358ad5bddf03c38933cf88f9c2337b8a9e548be561da4a119a3 SHA512 d7680bebe19102c0933f9723bc5a906aba6f8dcfdf98d313422804d9ef4bdd3840d765dad8f0edd1ffe4ed23f590920a9cec1045c85ab967e4e4ec5828c88ef4
EBUILD lz4-2.1.6.ebuild 555 BLAKE2B 54679ccbd1c32044f5e2cda84f8d637d6c67106e873821120c77100f969123d706888de95ca90f3a7df2a4e8e3bf5c6651cf7b4ae8d149fddff1f64835e2dd17 SHA512 4f2286c51a425cdc5df1f5e11dd842d0984c6ed83dc3f679ce44fbd496ea9fe4e46ba43023d867ad0753365a0ddcb26fe241312cad9ddc2e8b5b9e0bbfacbd96
-EBUILD lz4-3.0.2.ebuild 770 BLAKE2B 3e67f9f3c77e2c6db67ce630c9f16703dd2102f0f52af6bd432381d6fa5c23cae9d3360268e1b2a4eb967722b69b708c07686fa2316ff8eabdcadd579b6ce202 SHA512 db662b6f827e7d3570c34fb5c232eab6a3e10c32c62d3f04b924942d3a76450e1fbccab143cf58b38d28eacdafd093b8370da9f9d89bb2bc6d68b5b9a5c27249
+EBUILD lz4-3.0.2.ebuild 768 BLAKE2B afe4a474363a45711022944b3edce62b0fa90e93122b18ffa9507f009d0447c8a177bfbc184cf09f26e629956df55e260b5952be35a5ef6460d437020dcac907 SHA512 e2821ea70c43738a11c953c6d7bd1a17d85b294f509b396ef302a5d8930bd52e1be771286df7b8b1e2adbf6e367adcf52ed6820e90855efafc77756ccedd7efc
MISC metadata.xml 465 BLAKE2B 3eeb9b063e836d19b4ebfed81a89895f9d4e650b1788ca602f77f4cf3b5ad94cd6af93788293b9656baac1bce29a90a957c8d4afd02ee25b2aae42aefe211a37 SHA512 e5f75916075710426f9a7b875aaeb1239b948f11ac97a8d8bc45032d99985d6659916cd3c126bd37fb0fa53c97cca5b4eeeb4228180633809edc01af3b89ad91
diff --git a/dev-python/lz4/lz4-3.0.2.ebuild b/dev-python/lz4/lz4-3.0.2.ebuild
index f46bebe41b22..9ba1427dfbc7 100644
--- a/dev-python/lz4/lz4-3.0.2.ebuild
+++ b/dev-python/lz4/lz4-3.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
RDEPEND="app-arch/lz4"
DEPEND="
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index a82afee15129..50b70605b047 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -2,5 +2,5 @@ AUX mako-1.1.1-pypy3-test.patch 822 BLAKE2B a6c66e8ff7f430c005843dbdcdb874b520de
DIST Mako-1.1.2.tar.gz 469385 BLAKE2B 45c2f162a788c649f00938f9f9cb7a31f89ad92e0bb72a41d71287553d3f30d80394ca54002f669db0763b54570126c01400c7d08e04d79b0a002a2f45e698e7 SHA512 73b7a32ceb6e39dc2491734546c83a752bf0c8bc7546bb236801c02a5bccc5b59f2440333a328ff747eee936612dd12279f08d27d76f065fd589081d232692a8
DIST Mako-1.1.3.tar.gz 477440 BLAKE2B ffa148815d64f1fbfac0291e6afdbcf967d7445e13f364e1e2a492330ad1cd71a788255776e07bbec95877f65440073ec873b035d6f6fc1293a299b0478524a3 SHA512 a9b94fa34a61e7794b6e4549fa0bada6ff84dfb0d9edb8d5c7f9b95d12184fa4499f42303cfee720b576a9f7e986a57d91ad3aeb26c9f93154dbc08fb2975952
EBUILD mako-1.1.2.ebuild 1192 BLAKE2B 72d4456b5161cd6c67b770d5f5d94141b9243a8d138fab8deaae51c161ea60cb24ea1e687efa9d9d76f8dd585ee1956de253c3b844d22d82a1380b36e6eaf0f2 SHA512 e167baa394a710fc492ee267b1b3ef4350cfd882da1bea316cd657f122766fc2690fce2b13ab39946e2e5e071dcc7856694b0c0e835ac69ac08097d9a1030669
-EBUILD mako-1.1.3.ebuild 1201 BLAKE2B dc402be2671be270db3d1414fe930ae5413ba2608118fb3b3998e0c637958d6dc83eed0592abc4e848f4c30880f3fab0f6357e16e8a5e52687c55b73807c9c62 SHA512 6341d0e92111ca82b3fe8f3f37e40ec71da01250915838e06fd9d2e78aa03b12566ba27ef8a2ff6be4aadf7f4a21ecadb09eda6e0fd1302d51db233aed9647fb
+EBUILD mako-1.1.3.ebuild 1192 BLAKE2B 72d4456b5161cd6c67b770d5f5d94141b9243a8d138fab8deaae51c161ea60cb24ea1e687efa9d9d76f8dd585ee1956de253c3b844d22d82a1380b36e6eaf0f2 SHA512 e167baa394a710fc492ee267b1b3ef4350cfd882da1bea316cd657f122766fc2690fce2b13ab39946e2e5e071dcc7856694b0c0e835ac69ac08097d9a1030669
MISC metadata.xml 464 BLAKE2B aa08f15bb15d98ba21a42c4cddab014f83b701ada29a2e8f9e445e4055885da957d2029189c895630d914ae0de040a47fc6e088a04c2a33fd47b92d1e564776a SHA512 dbd099adfc1137934764551e38ae97b9a5a32473f86402375e70fb638131e748392f7e0a3397ee7850de3142fb840160269f24be53ab4f532490869397952279
diff --git a/dev-python/mako/mako-1.1.3.ebuild b/dev-python/mako/mako-1.1.3.ebuild
index 41ee455ad58f..5f82325b04d1 100644
--- a/dev-python/mako/mako-1.1.3.ebuild
+++ b/dev-python/mako/mako-1.1.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="doc"
RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 3361430a307c..231a51098388 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -5,5 +5,5 @@ DIST Markdown-3.2.2.tar.gz 299658 BLAKE2B c5a0337b6633ac3d795885d138ee3c078e36fd
EBUILD markdown-2.6.11.ebuild 1345 BLAKE2B 2cfd63d4168a44df5ddc9845e0c785930f46334b1d9d32b4387b80a8ba8e1f9eb79c757ce4beb065179dc39c73d2bbee59fda07a010d201b34645acfa6b70235 SHA512 6b176ffda719576552b071fc2eccdd6a6b2cfbdfb51fdf0ee19e4807569587b7063415b15fcb98ae506b03f9ca96b192db2379f42a7c1bd58e2f27bbcfff805b
EBUILD markdown-3.1.1-r1.ebuild 903 BLAKE2B 60d5ba2d6c2b2686b3c83295ff1f7065dd9992778595adfeb3c2ee38a4d1a74d488756e8e4ceffa96ba37893e2dd233720f0d0bef3b49ed5b357a5262af3923e SHA512 16fd37690ea6fab8ae54ec8db11aa517d541620f20cf89c51a6027bc07fad8990a05a4741fff40b72f45e83fa564aab327b16b60a0a5739dffbec29efe054bab
EBUILD markdown-3.2.1.ebuild 897 BLAKE2B 70da13b9a271b2dba5887e73bd79fdb73c78f1e25993b43665e714f5ff74fe15a7e12895af864af4ccd8316dbb6fafe58e0ab72d36c0404bfb0cf7cfc7c12368 SHA512 1ab68f71756464b0fd724fffb56140f783017060d1415b2da1ebc44564252a4235bfdfd484096f0e7d01420eaf25f38262b9e9aa8c5e205a233296c2f15eda00
-EBUILD markdown-3.2.2.ebuild 1016 BLAKE2B 86dd6a862379ca20e1066700ccd3eb4ce9f88744b32da59552126d074bc77085c482f494b7e275f3c82a15f14ae3077468a9b856b25b96a76d104e56fd85a30e SHA512 db801769aa22afe3833626e0f0ab730c917ab28ce5c858932988983cdeb2bbb59beb8190d5598e839cd1db12d2643f7fdbc67016fb3ec68c79c7f198ac6b3660
+EBUILD markdown-3.2.2.ebuild 1008 BLAKE2B 787dba2d7e1d2ce2af3e1a8670b97b47ca0d94b081b16bdba4190882efd33862a609e2e0616dfe0ab0c87a54deda7f42727e70bfee8a03af62b8cf14be60ae79 SHA512 2ac884628b89540f672fc28fa0a76478d9bfba308afaaf2d6c48360b0fcde72dcd1a3780028276ed0b4e6efef1daf9c95a9b8af83b0dbb6389f6981b1349ccdd
MISC metadata.xml 490 BLAKE2B ed40aad7c21b46bb6e3395f5a2fd019256a6a47f587eb2a37c42ce1d4407bae188b581ce20be2f2f01f1d4003d2a76aa44ffd516b0d6bbf08010d7d3d9ad02b6 SHA512 4a93ed6bce680acd807a2ee9bed7a3dd999014681ce7d5e5ce95025b6fc5e078716057ef25edfa7f4656a3feb8e92041aa99f52e62e04b034c7a493ee26d7b97
diff --git a/dev-python/markdown/markdown-3.2.2.ebuild b/dev-python/markdown/markdown-3.2.2.ebuild
index dfc0217a35aa..40f77b20f11e 100644
--- a/dev-python/markdown/markdown-3.2.2.ebuild
+++ b/dev-python/markdown/markdown-3.2.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P^}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc"
RDEPEND="
diff --git a/dev-python/minidb/Manifest b/dev-python/minidb/Manifest
index 09a4657478fd..a2de1f6c795b 100644
--- a/dev-python/minidb/Manifest
+++ b/dev-python/minidb/Manifest
@@ -3,5 +3,5 @@ DIST minidb-2.0.3.tar.gz 13992 BLAKE2B 7ccb26625c199517ee63e99b1839037046c29a4c7
DIST minidb-2.0.4.tar.gz 14104 BLAKE2B 020996d1e83a84aad26d073b3fcf5161edc1698f0876e499b5dddf88bc5ad776d5203c9dfd49cb9651f66425dad5bf9b3a751940da2cb3f841157af23940ccb8 SHA512 c7f34b20fbfe3300957d1e73a6237850209b55ed08f7d9de1e5dc710fcce8360e359136f8f996aedb38620ae08122e3e1c44922c60db6c16a1d57711d47a8c61
EBUILD minidb-2.0.2-r1.ebuild 592 BLAKE2B 53d23badbcd6caa90f6b76359d9f44b85e31f0ec20b3d2f03d671e49e8fe24926899d254f6ba4209425082ebfae4ec441ea71b174a8b9a948b111b3242631e55 SHA512 1d0354576b6a1a174ccc7404fcd4331caf49b72ada41a59635f03df70648abfba0ca32355304bf3868f61eebf822bdd45eb34d7021ec56f58c4e70646c9fde7d
EBUILD minidb-2.0.3.ebuild 440 BLAKE2B a7093c6d5f6e7c10e9473f7a06526f6b498b0b8f8ac5013a372941d7887586d1d01d3b687269cba0e247b7847c18adb8e4a9c73e1f892a2cc8207e6907f3263b SHA512 701fb99146f30f35e16b9ddf3a92a559220e740cbffccff871fd1409e503897f7c2908a5c62f71716bbf65102999f417f47efceeb5375f9a232edbb8a264433e
-EBUILD minidb-2.0.4.ebuild 445 BLAKE2B c4645c6b95b4622d3fc536f95d2104c40137d479227a3434d6f0971892119b2c04effe98a547bbe546030833370639a012711a0eb11fa64466eb029ec89431f8 SHA512 25822938b715a87de7495503c7bde24ce9baba2a24e3f7a06fcdf16314b5598e98b5ee88326d2a98517806fe483888873a468e406b0b1075ba5516758492f0e6
-MISC metadata.xml 422 BLAKE2B b5d93a5b4470c716205ec803434d612c404f45c9b6ee708a56d57ea120c423cfa86f008bc47ef0690836b3cc92c6eae56c3b97959671d6ea72ad751868d3d94c SHA512 c2b0dbbbabedccc7036eecfd09f403f9a5848c6f71d09a12e5be773506c6ec5a5290f459e8cea9505abcd438e47ff84f8c32ffacf6a62be365bbf8c92f6c64d0
+EBUILD minidb-2.0.4.ebuild 442 BLAKE2B 7bcc8891e162be8bb53403d78d16d2e565dd55d5ddfe5a87e5abcb103c76cc99ad79a8bd6d8815cf5a7e90aeadad857745eb954e9b6c55422cc39220b3359977 SHA512 cf691ae43b7b55dcd60033b476b6ed0a7b07c25da4761359c5ea7b3049e2e201d51629977ada66d561a6286fc08d63b678f670c9699d2268cd594f3a9a074b20
+MISC metadata.xml 446 BLAKE2B 46a86136a6790fb2e9923525fec5e8b52420ab0342ca4089f2ca7ce55afe41d96bf39f55fd33af8e006f65e15f59eed09e0ec473ab72041e6bccee8bb06c51a1 SHA512 b29032fafb54b53261e748273f5cee899a91a87e2480057eac9aea9f170e2bda001fbdf1519349cc8e3d411cd64a1185f954920f461c52bb8652d87286207d92
diff --git a/dev-python/minidb/metadata.xml b/dev-python/minidb/metadata.xml
index 91fac9f6e930..c2b5d697e187 100644
--- a/dev-python/minidb/metadata.xml
+++ b/dev-python/minidb/metadata.xml
@@ -5,6 +5,7 @@
sbraz@gentoo.org
Louis Sautier
+
minidb
thp/minidb
diff --git a/dev-python/minidb/minidb-2.0.4.ebuild b/dev-python/minidb/minidb-2.0.4.ebuild
index 4f6ce1effae1..6430f1ee313b 100644
--- a/dev-python/minidb/minidb-2.0.4.ebuild
+++ b/dev-python/minidb/minidb-2.0.4.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
distutils_enable_tests pytest
diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest
index d092041ab54d..99d97b4d5c75 100644
--- a/dev-python/monotonic/Manifest
+++ b/dev-python/monotonic/Manifest
@@ -1,3 +1,3 @@
DIST monotonic-1.5.tar.gz 7525 BLAKE2B e6022a9c134031f1b89e643b4f7b37417366e08de213f580a39706e7cd57b1045e8f1625be213c90fba48b69c40461d0c90255e6a9f20e565ea9a857780e2143 SHA512 05485e0baa51df95f9812d463306ce0bbe7228170b43aed8faa9d77d2b613ffede6b57b3dd273c352e0d1c04782043bec2f36be88cb1acde182a5aeb0538f970
-EBUILD monotonic-1.5-r1.ebuild 471 BLAKE2B 0e27a2cdbc2176fe1283611036b4339a56c979494aaa3267ac17888987a909a06988e9d828964f847b78fcafb566373df0734939b19cb685f9916eb89b971198 SHA512 3c5c0eaa7a1c4be4bc16394e0f201ce4af35c1e1679788e8f8f1b729c5be0dd38e120f2a0e314218bb6d89f7fff0087dc57849b625e0877d26c4ad5981cad64d
+EBUILD monotonic-1.5-r1.ebuild 468 BLAKE2B dcd5fff2578850ba73ff7e42853bd0ed92c745514209635b44bd6191d5d4329f3c4ed1976133abd5da25c3dce807fd3dd8971a805693bccf7fe334b10e761b35 SHA512 a0ee4cdc0c5de11132e4a22ad78b6330880723301811856bd65c9c763049b14860cdcdbd456716114c302896b938d1c4a090a4bee8cb4ea6a61a1fc891cd3384
MISC metadata.xml 366 BLAKE2B e8045b50a2eb6fa77f3f95b4dd4dd775c2c986bb80eeb1e91f8a775e5df484da48ba7ddf32ee19a35c5a09e340880cc27f2fb70c45a371341872cd22ad01dd74 SHA512 d58d7d85046c7ed8b0deef7fcce1e60c720b8fe4789a35b507c0d91c8d2222d01ffb4778986c9715fe61efbab3109278d1ce76433f39397e4865a493d794f94d
diff --git a/dev-python/monotonic/monotonic-1.5-r1.ebuild b/dev-python/monotonic/monotonic-1.5-r1.ebuild
index 06aea1709212..9aa8a02deb7a 100644
--- a/dev-python/monotonic/monotonic-1.5-r1.ebuild
+++ b/dev-python/monotonic/monotonic-1.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
IUSE=""
# no tests
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index c710eb4d3733..cc7457fb8eba 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -4,6 +4,6 @@ DIST more-itertools-8.3.0.tar.gz 86850 BLAKE2B 2438d235a3778237c0b9e1bcbf47847e1
DIST more-itertools-8.4.0.tar.gz 83626 BLAKE2B 84370e495a6f32c856f751907e45c6155cb5d6331a84607eba26842ee4e964f8f0a01d2c16d4c5446e5e51cc24aaea619105ae24b067b9fabe3fe8741de526dc SHA512 70bf72594cb92b165f1bdc5050bcd3d7d37eeee65db6c631b636222005f8d7707d0c6ab09a229e9f1a23fdcf2be948e96d0882f9fa033f29b7a472ec8441a4d0
EBUILD more-itertools-5.0.0.ebuild 714 BLAKE2B 157f253d495410285f2c9c38f6487943eb2965ad1fc9fcb18ae4222f199b7db215995193f10b2d23163756a8ce5dc3600a7517cee2a2ffda69302faf204bf839 SHA512 75274ecf32e551be840489f74ba6d03c5c0cb3bbf85138282da5836b07f7b0555afad83d7640075e380cb90bef1db12327b44fd402a5b26c33ba085316b4c474
EBUILD more-itertools-7.0.0.ebuild 660 BLAKE2B 9c1d96501f32515dfffb61e65baaf2c81daa7a8a9f94a582ef341ac00b2bb160c72200a9ef415f2e847e37d1dafab6032df192c1f48a429826b3a49fefc05f33 SHA512 31a0b198d7bd5533c49301b6abd83d2a5cb029dc3e4fc0ec566cb85a6c82bd648ba843aca19fc77275a7b1f6518dabce727493c716f2f9fb84173b92130a7b33
-EBUILD more-itertools-8.3.0.ebuild 669 BLAKE2B 365de101d7a208d6dfe8bc956a38110a95c25e2e152d564dd5ea5e8e29b669032d4d8d34ec4e813075bf08d4ba48dad57fc196fad8aef8b0f4dbaf636856ee4b SHA512 a53f2d0928535bfe5a80a968a01ebc3449f6fc153a79152643996e312be06056e58539c394e921b1cbb8f28dcbdfd5c31c3a85427d6e08afc5cb2218d8354596
+EBUILD more-itertools-8.3.0.ebuild 660 BLAKE2B 9c1d96501f32515dfffb61e65baaf2c81daa7a8a9f94a582ef341ac00b2bb160c72200a9ef415f2e847e37d1dafab6032df192c1f48a429826b3a49fefc05f33 SHA512 31a0b198d7bd5533c49301b6abd83d2a5cb029dc3e4fc0ec566cb85a6c82bd648ba843aca19fc77275a7b1f6518dabce727493c716f2f9fb84173b92130a7b33
EBUILD more-itertools-8.4.0.ebuild 669 BLAKE2B 365de101d7a208d6dfe8bc956a38110a95c25e2e152d564dd5ea5e8e29b669032d4d8d34ec4e813075bf08d4ba48dad57fc196fad8aef8b0f4dbaf636856ee4b SHA512 a53f2d0928535bfe5a80a968a01ebc3449f6fc153a79152643996e312be06056e58539c394e921b1cbb8f28dcbdfd5c31c3a85427d6e08afc5cb2218d8354596
MISC metadata.xml 475 BLAKE2B de5a09fa0987ae45ca73d94cdf2ecaaee8b0f697e1cc4e1b535fd16f50a10460cd5a3293bc1a0633ab099c3ef07fc1ae0d99a2faebfe4117f0a5ab53837ac94f SHA512 3cccec99e9f80ef9751d2e19fc196a177f62a6b72ada30859fb8cc577fd362cac9b8261869b59a85ff1e8b4d9716daaf190cc97b3733f63e014d2e2c838d00e4
diff --git a/dev-python/more-itertools/more-itertools-8.3.0.ebuild b/dev-python/more-itertools/more-itertools-8.3.0.ebuild
index b1c4f1688dec..ef2bb6f5b256 100644
--- a/dev-python/more-itertools/more-itertools-8.3.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
BDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest
index fec9d11dd689..44833ced1a42 100644
--- a/dev-python/mpi4py/Manifest
+++ b/dev-python/mpi4py/Manifest
@@ -3,5 +3,5 @@ AUX mpi4py-3.0.3-py38setup.patch 783 BLAKE2B f92a508e2f8c0749135b79c926566627294
DIST mpi4py-3.0.2.tar.gz 1429331 BLAKE2B 9e35749a82698ec656553583f01ebd8edbfb3b649c7693a9ff63f9f6abfa3fd41a54cbe4e3a1de55cbaf4dc626602706c776c505d0f5c0d82ebe88f2b4ceeddb SHA512 0a18332fd45e8e80b8dab0761fbaa30444a0d55776af7a2333be17ade827e92d04ac5bb8619ce26937142f344f75de0e5ef6dcb7502f33389716aa9482ddf5ab
DIST mpi4py-3.0.3.tar.gz 1429389 BLAKE2B 1e8c44b857b417237832682d0b3b5c90d1f1046fd8137d2a63972419ff8ec0e1fd2ebba521e2d2d6ba9f773b7c607370b55d8d75c9afeaca172ac06dd838943c SHA512 041768f753c8188b2560fe92711861780f0d77eda3281433520c98bb1e9b4da6a89c364f2d1c4623868ffbbcfde34ef556198b1bef6fc1c4a9c19cd5e71b546c
EBUILD mpi4py-3.0.2.ebuild 1137 BLAKE2B f1f4357752c4db2b6e0dc6ff36e1d440c2e39c32f7f34c3dad8a2f156fba35f13b9765123ee23ddb9bcd3647e3488cd85f537421dde8ac69fae22c0f4449b67c SHA512 111a3074e7eaaf69c84a92f2a657ae17ceb2c6814a102a0b62615c9b44f16ea9b249f8a6fcecb8d19a2d50918b750f6e2bceea875f655684544e0eec242808b6
-EBUILD mpi4py-3.0.3.ebuild 1439 BLAKE2B 321ab070f8fe4b2b060071863cf3eb87c9ab0f780e1b8f92890ec2fa3fcad96e18045f33402e356db3de4c18ec7e57bb5db26b996898995275923452e2b4d1d2 SHA512 168c8f310c9ac68157d9b581293ecfc6647cf6ccb9fbd741da511945826b0436174cf25912679cd1a9350a3434de9771fd65ccec5b47ab7911dc8d1f0f2073d1
+EBUILD mpi4py-3.0.3.ebuild 1438 BLAKE2B 462178ee55d9248c3f192a8fe43138bcb1f68109c5bcbad35511bb2146f490f216fc4a3d3c0c186f7cae0ebb6c76475d892e37d6deb01ddc0d021cac9e4aa8f3 SHA512 3eb6fcc42f1a37dd74079cef2889b46b6900914084a9e88c8fd036da6394af302986212aae19efadee93e6df395d401891be7167ef89a90baf1269ce98f8c956
MISC metadata.xml 1118 BLAKE2B 0bc626a2106e628d7eb639e6ce90c4badb63ec2ea66b0322e7b83418791b7edc4bd443294fba3d31133812416eb4428b5dc47d074da3aeebf6867e8a0998d046 SHA512 7afb6d05007036bf5562d6d262165d8c2576bb49a86f9230f939d6a2ef929affa8461fa6421ffd8d97203a4425b397a8dd8556190364f29622e53a67674978c7
diff --git a/dev-python/mpi4py/mpi4py-3.0.3.ebuild b/dev-python/mpi4py/mpi4py-3.0.3.ebuild
index 123da6c26869..cf461c4e5fbf 100644
--- a/dev-python/mpi4py/mpi4py-3.0.3.ebuild
+++ b/dev-python/mpi4py/mpi4py-3.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index bc834c6689f5..7df7f2b87e1e 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,5 +1,5 @@
DIST multidict-4.5.2.tar.gz 56753 BLAKE2B 01db2ea847e5ef2fbd4eab89c8a6070f3febcb0046be7344469a7e8e6de6a3c2b2af49069e64953dfcac0044d581c6af09eee70eba78dda8cfa9e0d11d3f1947 SHA512 ec66cf3c57e3386e07e45641536a6eeb94e9707d8a0d3b485d22b8687f20282c9115d533c7b0e9fb6dba28b923cf68dd8cdda08c75e78ca4eca2f0c3ec23c58f
DIST multidict-4.7.6.tar.gz 57710 BLAKE2B f08a45d4ce404dbb64d2561ee2328c0aa3a8fbf65483082c11e5e1554bec23e5c711da2350e241308a1239256b942ef6c420e6e51aef342b380cc01f84d4ca72 SHA512 5f90cb04fe2562884c331018a5002e1370e2596e0afd21e4289ab696847a3028a074bbaa6717b3905161f823f8592d6572475307039f8f97c1ac65aad815a6b0
EBUILD multidict-4.5.2.ebuild 1129 BLAKE2B 017145854cc27f2c1280d8f81fa1fd7204066d36b000c827525d786ee34e78cbd309c7dcba54125dd048973e4a8dc1f16d77206b258e53d7a87a5839e92f481b SHA512 067dc0278f9cdbf3bb61f2ce6530b67000a535d234f010fc6f2066638faef40d9b108c9b0b76dce7a22396b9010b37a41909634386c80e22502f277150133bcc
-EBUILD multidict-4.7.6.ebuild 732 BLAKE2B 1d275ecf90899551cc5d44f08bfcdc8642bc8b787f654869e91675eda46b897d0f855b30a423cb65f62ff72d036f20d04859190ef2a545491c5367f1fefee285 SHA512 fd3e5f8072f003227a292f7d61c707a34f090e8338fbd80c2497c5243c89f324443b846a08e6ceb98b69dbe3f828db67b372cf86d29eb3d404f7c0c275c94509
+EBUILD multidict-4.7.6.ebuild 730 BLAKE2B bfff4772a8db0872544e167562c871adbb804021b976e54f007575e3971212caf90e27722e5212bdeed44a804b3a1cdd83e9e40f64d445d0d5268594f2987e7b SHA512 0d8e8de9a6338bdfd49d28e46490aee4d2cfa0cfa808fda071c365af0733f9c652fc02eca81fc1086616c622bb8d64bbc8418ea323ee9ca78d657a29e06bb13b
MISC metadata.xml 428 BLAKE2B 3f7c1f816583b35bd0150ae21c61142bbb7ac5b216edb5011bc032410e408f2566801db025c8f6274dafbfc555b0b32aaca2708684a3601ffe8d371b23e0d556 SHA512 edb199503c42c55b838b5338656b41e760c90ec3e81114106dd352e2c3886f0161a0c6ef258c5c0a0728d2420bde5d26dea41b25b030eb947dbacd702cb2b594
diff --git a/dev-python/multidict/multidict-4.7.6.ebuild b/dev-python/multidict/multidict-4.7.6.ebuild
index 80f447507069..270935946c2f 100644
--- a/dev-python/multidict/multidict-4.7.6.ebuild
+++ b/dev-python/multidict/multidict-4.7.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
BDEPEND="
>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 0df0127104c1..8758c1701cd0 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -5,5 +5,5 @@ DIST nbconvert-5.5.0.tar.gz 583216 BLAKE2B fce42d68fcfb5439607fcb0fa8475462e929a
DIST nbconvert-5.6.1.tar.gz 703233 BLAKE2B e75d558aee6c66fe8e7455ecf22dbbcd2a0698380ffec80eff15aea6c70bc853daa9ab2fd1d114453bd5dfe7e75617afb9f5c1075704bfadbb59fef34bca88a9 SHA512 0c68adcb9f28ead9ec058fc2e02a9a1e6f65818709c99f7a006a59a7562b5f5ee74afe5287e41568c35542898dc1b43c4543d2386cc05a721b3f99d5cc789435
EBUILD nbconvert-5.2.1.ebuild 2119 BLAKE2B a08f56ff246159f89f487e7d4f671d55d64c1e5f0e1fb1ade29d211c84774731f166f0005f25958c560a49f95ff3fe6ea836c556455669e77c4b7c8aee623b8c SHA512 320938050a6f3a3bf7ec2430e04c76443e2410981ce7622d7dca8deaacd2e4e33a8c1b081d3a354e3deb64df333b16fc3e81177a53bc9a343601e09fb35b876e
EBUILD nbconvert-5.5.0.ebuild 2103 BLAKE2B 45671ea644d557087eae45329e1dc1c869ff2f9ba347de47c5cb1d50497d3af39a6d4f927d75447e3f86988137a25e24edff1bc845b5a97957d5cdf245cf638e SHA512 4ced8cead706d1341d4edacf163f78223855096a48245d619792d80c80ea67bdb43b1fa8f2073d2a124ff4cc5cb72aab7a7df5bf8eb4c34eed0a398197d2f8f1
-EBUILD nbconvert-5.6.1.ebuild 1776 BLAKE2B 73e15c1584cbf8b935319cdbfe4e5362d686eb4c752ffbf6d4dc43b21fff9930dadfe2e3772ddb2624e9fcb68357d35c7ad5700984091a5e610fd53ea34167a4 SHA512 bb202323abdc76426cf5b5c754909451925b1002f1968a9fde7571b76ea9176bf79ee53d5f4358d5cc1cee6c52d42ea3858bb258445865904f55ac058c51b5ea
+EBUILD nbconvert-5.6.1.ebuild 1775 BLAKE2B 0434388e1dfc089177035dd63f6cb76c5188884626ba68341f11d0f3da8c01e424242c4cf48f2df6594e66cefdf516f9beecbb9f6d8c5f55b3aea7a424bdda19 SHA512 1a4434ebb50ffcb06efb18462ee7fa69d266ed18e6009ba527ef6a5576b5e08e149319cb71ef5bcd505d22617d3ba7e0049622a7de034333f8b56eb9d111a758
MISC metadata.xml 501 BLAKE2B a99beea687357c74454ec232dea268f95e9b775c882b1ea29e196ec124e829b9749d5fbc4c585f88e46c16bc868d57a757b6f9043545bc5905e0dc86c7f0b44a SHA512 d0735c82e490860baf8ae76f78058a9981dc345d7f5b06d54bbdfd1741a7619f68dbca3386f7bba12b58df46a1125384935de85dff3ad883fb11781df933a866
diff --git a/dev-python/nbconvert/nbconvert-5.6.1.ebuild b/dev-python/nbconvert/nbconvert-5.6.1.ebuild
index 594d35db111d..b39a643dcac7 100644
--- a/dev-python/nbconvert/nbconvert-5.6.1.ebuild
+++ b/dev-python/nbconvert/nbconvert-5.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index 0289cfc4583e..72fddd58d386 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,5 +1,5 @@
DIST nbformat-4.4.0.tar.gz 113683 BLAKE2B f86d85d4f8bd7b2253a958b7489f8a21efa439cd75373740b4aba215aaf2b63c32ebbc88541c9a7c57bb80ef00a996ba55313c3b830063305b9a9b41b713aef4 SHA512 46cb78bca374ef49c4461f230cbb8eb4af611d7be395a448680964c759d47fa8558dd07de96c43921ca171c486707dc823e278b724d9dab51bd30c3dab47ff6e
DIST nbformat-5.0.7.gh.tar.gz 125328 BLAKE2B fa048ceef9d0612052dcf3180bca4228dba5117c6b0fb642f777bbd35e2b6f868454ae3d793aa0da3904757e42309ac53be19621a62967b719da86ab37d5f052 SHA512 3c1429a232d15d023f161f41cdab3364242f1a026349ea5aaeceba6a80afba981cc512a9f148ae3a0fa856a847c4560cc95abd965cc5d088a9f89c2b61d48fd1
EBUILD nbformat-4.4.0-r1.ebuild 1244 BLAKE2B 05e194add2b79c08e6b6635de2f0dfb5aecbb3da1de181389d1427a704825fc564633fd5af2fa41a18e434f77b556e4e06fdfb49500f59479802fa9d350091ab SHA512 5b1f9548ef925c350dfc7502fba1487b0d0ebff2ce3a2ebf359313de78e8548594d6be59e49a68fec56b58b22cbd8965fee139e62b17f88940d36d224d2492f9
-EBUILD nbformat-5.0.7.ebuild 801 BLAKE2B 2781bfb300d2ca1a73397a4af1cc01cc0aa6e16b17ac9e14d037cc56024954fa8bc71799fa9cb94cf2ffed4691796a094dc188d06b946aeea320c277dc36b40d SHA512 90517693fe5f401c7c45af8413877c24faf666d6c793e31eba8cd6c9d2c46c9c288a046296357c612a2c35815a2b20ab616d37250e98fa41f55c4fab70e731a2
+EBUILD nbformat-5.0.7.ebuild 800 BLAKE2B 03f4e4db31a442e44cfe3339b5864fbab222f3035eb726a9f80613050e1850be2be685d16964e6f75cae8a6060c978fec2a8ba4c1a4f5d4dfef9e80bda80f885 SHA512 d0923602e1a9b4ec2eef1634cb4f397f0bf8badc1fc79529096e554fee137942406d35bfe416a1fe00ed81642f0a71c407fdb45d89a5e91a7c0bf417fb287189
MISC metadata.xml 754 BLAKE2B 566e6a6a59e274323550624d9444267abb5279ef663328aa93906685a23bc7b38888468ccc3284889e3a1c6607cfeb501926ab6ac5ab84c5acd34fa62ead4205 SHA512 898ed2b6f39842e6a4624a0c7afeaa6480197637ee781001c093c21b807c094f5ec1cf436abde53b6d483abfe170c7b8720239b648499a697f0be140a0212be5
diff --git a/dev-python/nbformat/nbformat-5.0.7.ebuild b/dev-python/nbformat/nbformat-5.0.7.ebuild
index 23f19a3586f7..12cbc9032597 100644
--- a/dev-python/nbformat/nbformat-5.0.7.ebuild
+++ b/dev-python/nbformat/nbformat-5.0.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
RDEPEND="
>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index 6f3d82f61806..15c238bc634b 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -3,7 +3,7 @@ DIST nbsphinx-0.4.1.tar.gz 108928 BLAKE2B 449ba009003c1de52057d558039255f80efc2d
DIST nbsphinx-0.7.0.tar.gz 129485 BLAKE2B 0a11934cb53c5c20498abd1d189f26351ef088f7fd7972f7e1a4bd98e21ced330a600a2beb1a4976798e1ead1170f6322ff8b5f393c30cd85d33593720dcb57d SHA512 2c8db730102e483b76bf899bb5fc1e34bb4ed817a65fad221ccc5ea7dc74c2a4f4b69398d01209a904f503acc7fae2c29ad701e6cc11ac30bae3a7e9bdd89357
DIST nbsphinx-0.7.1.tar.gz 129553 BLAKE2B 635d102804a0e9d3c649707c874d28e8455d3e7082653cb12542a5fbe9cad991815f9f577333f3850347ccad46b77e880d40581a44e1e4fcc515be1ff40d90c5 SHA512 af03272459f5cc20ea2e0abc644ce602c6be5a21c7d3e81950ca153cc6e9566e89defb6f1cbb4caa154958f3e8832d0924dcd1ba5b902d2e1a4496f5c3ac6c8c
EBUILD nbsphinx-0.2.14.ebuild 654 BLAKE2B 98f4dd4715a5a776cbe8a0b1067a8571e0ab3c2e5e4cfd000eeda249e28d5a0e0b129a2f3dc40ae4eaff4d7096f7d64cacbdaaf921403b718d354e7a3b91e6f0 SHA512 9e7a26f5c5c6e5f069507b1c6ef5c1eed9f395fd8f2a56271bc6a2e00d450400939ae89d7fed3cf2379c41e999b0c8148dfc45496e8568fe599c618f5fae9a61
-EBUILD nbsphinx-0.4.1.ebuild 656 BLAKE2B b8a9396284ecb1c9582d5098a3888f03c05cea445dbff6f7975e44e8afc44812d1af9276976f33511e00503850b746f9fe8528a66ea1b0507be46c878fbab494 SHA512 dcc6024e0a741dbbefb648c13796f03d1ed05cbb396c40f53f8e27d4c7bde38633d148bc6876f00263a010c94c50824848b3ad94e64acbae7df77dc4770f8be3
+EBUILD nbsphinx-0.4.1.ebuild 654 BLAKE2B 98f4dd4715a5a776cbe8a0b1067a8571e0ab3c2e5e4cfd000eeda249e28d5a0e0b129a2f3dc40ae4eaff4d7096f7d64cacbdaaf921403b718d354e7a3b91e6f0 SHA512 9e7a26f5c5c6e5f069507b1c6ef5c1eed9f395fd8f2a56271bc6a2e00d450400939ae89d7fed3cf2379c41e999b0c8148dfc45496e8568fe599c618f5fae9a61
EBUILD nbsphinx-0.7.0.ebuild 634 BLAKE2B 251979e490381548e16ee34c9e024d3d227aef3ecd20298e1d50c304effc0f2d8a8278be26e073de83d3540d25d5905c111b3d7a64c825ef983d6fc4e58d9ed4 SHA512 97540ffa327827e25bd4c38aed7f9224df33b631b5c6b545a10bd510a28a8180a83e76dbfc102be8db203c45563b173760a3368a08f9972c7511a0b958827954
EBUILD nbsphinx-0.7.1.ebuild 634 BLAKE2B 251979e490381548e16ee34c9e024d3d227aef3ecd20298e1d50c304effc0f2d8a8278be26e073de83d3540d25d5905c111b3d7a64c825ef983d6fc4e58d9ed4 SHA512 97540ffa327827e25bd4c38aed7f9224df33b631b5c6b545a10bd510a28a8180a83e76dbfc102be8db203c45563b173760a3368a08f9972c7511a0b958827954
-MISC metadata.xml 809 BLAKE2B 2724ffcef846efed97ee16e7395b3362596c46347fda07bb418469f3e39f06e0523177e7a8bee35cab7113de6380a1b7ca34a6b8bd108e765796fe12d4fcc478 SHA512 03c63397c153886e8ab60767ae510a4d17350a5a2b18c05ddbcc453ef81581a029c3c63fd7c82b109dcbe9a142ec32af1650b240c72d8f95097be326c39a7080
+MISC metadata.xml 834 BLAKE2B 628cddfa0e7fba3b9668e7cf53b3a906330a2bcc8d1bd8957d811558c98e48487f28f058d0bb45b4987977857461af2bb122853f6578ab67c2a6f97d242b4880 SHA512 b6c045e0fb6636f440e97b167318ff6cb0f71c8ba6cfd05c3afeecb4580ca1f37f03d765921624ad8ae54bfab76d0d913fb8eb30cb70387104d6df90167b4c65
diff --git a/dev-python/nbsphinx/metadata.xml b/dev-python/nbsphinx/metadata.xml
index a586fea8a7a3..bc168d6b26ca 100644
--- a/dev-python/nbsphinx/metadata.xml
+++ b/dev-python/nbsphinx/metadata.xml
@@ -13,6 +13,7 @@
stored output cells -- will be automatically executed during the
Sphinx build process.
+
nbsphinx
spatialaudio/nbsphinx
diff --git a/dev-python/nbsphinx/nbsphinx-0.4.1.ebuild b/dev-python/nbsphinx/nbsphinx-0.4.1.ebuild
index 4af0f99f1107..f469dc231b4a 100644
--- a/dev-python/nbsphinx/nbsphinx-0.4.1.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/dev-python/nose-random/Manifest b/dev-python/nose-random/Manifest
index 49ac1fb24a7b..a9c3bf1dc821 100644
--- a/dev-python/nose-random/Manifest
+++ b/dev-python/nose-random/Manifest
@@ -1,3 +1,3 @@
DIST nose-random-1.0.0.tar.gz 3776 BLAKE2B 18dc40b13fcb970c4d2edeb6be9c6f3e710b36d14dcdc4a56c6e3ecf811ab2acd6be3e1c1cea2231eb5dc10581c77f201220354c77f3d9f67d89d894ed8b4f24 SHA512 9c62413fb00c3b774954ae7a65b08b122ae0dd2b24377efba8de345597b4ce4952aad09a0c2fea7f9d92f57a3664908fccd6eabadf32074a35978c958ea2b66f
-EBUILD nose-random-1.0.0.ebuild 496 BLAKE2B 9cf27ff201ef27b3ce56860a0966eb4bb7924524bc60382b55a522a8298cb69243a45d39d7585b5d510a9743c18e081404a59b383351a79c5d5fc8c579a9bc23 SHA512 0276e409635a78c06fe430c015748c92dc6d304ead697b2935b183ed173755748189ce34a2c3ae73ab1b1ce7290976e924e5cf5e06b7b013114e7d1b5105e9ab
+EBUILD nose-random-1.0.0.ebuild 495 BLAKE2B ae1eb5529087647d8212ab92059f8f77971be1ea07e0aa47e92c1c814bdf649212052b5f36e1fcdb9d7c27a6193d23cad33c43df9bb304c61f852d8ef1b246e1 SHA512 ec08c1b5ea21580e781ad2fe671bbe208b8ea5652e90f0c2389cf67e4e2864203f50a187185e6fc4d7ce26ff9c229e280875be616dae2100c4189ed881266fdd
MISC metadata.xml 338 BLAKE2B e8be381e5e42a081be3637b77a9b5356dd7d74d0352976badfca62bdf7b65c04554552703b3e12e169ec1c4b57d07cedcf75387a0fd65a8177213f0de8bffa9c SHA512 b3e03151085bcaa51e2108d7e69042523148aaba924415421323d53005c1d047103827ed99bf064cda4f02cc313b3ff4e5fc681bccb5f1f23a82b40a744ed9bc
diff --git a/dev-python/nose-random/nose-random-1.0.0.ebuild b/dev-python/nose-random/nose-random-1.0.0.ebuild
index 661b2bfb4ebf..f041fe60d6ff 100644
--- a/dev-python/nose-random/nose-random-1.0.0.ebuild
+++ b/dev-python/nose-random/nose-random-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fzumstein/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index ac2456e179ab..f10f65719fb6 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -3,5 +3,5 @@ AUX nose-1.3.7-python-3.5-backport.patch 1802 BLAKE2B 8513cd506f7031ec4af1a4acd6
AUX nose-1.3.7-python-3.6-test.patch 3289 BLAKE2B 4f19c4f6e4f376cb09896f9e7b054753c339ad371e151f01cc8c54e83ecffee72e4959d827a88d03b4944192b43085b50017ef8b8785222125ce32fac5831717 SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127
DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
EBUILD nose-1.3.7-r4.ebuild 2756 BLAKE2B 35632aa573ca794f3ebeaec11b83c6f7d51d292f84567b070c4530a8520a0603dc453c66e5680895610f0d6f5ae91c6fb07a1fad13aa70691ebda7771893d9ff SHA512 a3475035911fe40dbc9787b7554740983fb6bc4a9b1d7ff9ebd0018259e62eed7948d0ac39c2b1c3e23428ba2fce6c7bf5d388f97205d82e10fa688abaacbf5b
-EBUILD nose-1.3.7-r5.ebuild 2314 BLAKE2B 9930f846e80f5f991e3e7bc1871e805029597adb6b5628265e0d769086f94aa0992d1a1725026966cef3a09c180da30a4fc929213416d3375448fb6a9e097504 SHA512 aca4b69d95206ecfd0aec7b5733c682965c0bbaad17364f0efc796daec1fe9ec646641a214932673b8c2514dc7fe416c96589fdf277a9bdb3b4b2028f5f201a5
-MISC metadata.xml 499 BLAKE2B 9d6ffb5484f11c5f4c46e0013d4e93d01afef48339e83f4e4fb7d86776267256b30da1aba61c2609e5163abd012a57bc820ab77ad79577e748b56f7e8c327cee SHA512 c037d0a22b7bc9f61c10d8223932f2ebdaab4d9ac538dff56ab7e6fa263734992e8834cf739b7d787cd1243af5a9ccfccb81c2c0e4d2e8889498a707c96bd44e
+EBUILD nose-1.3.7-r5.ebuild 2305 BLAKE2B 2032bd9bb74f89b9e174fda5113056f35de572d19ef8a06b5c117ca5895161c0c3b2ec40f058f5e91683f225d51ada4c7b697c35f163c384e160f76bff5eaee4 SHA512 4f21b7f75088066be536a0d5872b2f3973251dd69436324cc9aa89da1208fe0b73b1a2e0a621f42111c156dc34d8ec351086307c2584b8903330b4476b901767
+MISC metadata.xml 524 BLAKE2B 90a98bae0d27a49c51aee677f8bdebcbee461d74fad0f349f73458229098ba3038705d63a88c59f90ef8621931e5d3902c0209bd627c28d2b0296deaff4af75d SHA512 4dc9346469b9b3a0b87fffe49db530107a019bd798fba0620b671d71a43805537face8451c24d6ad40bf11ed3498d8970ddc1ce3109398534c9f3c8ed72743e0
diff --git a/dev-python/nose/metadata.xml b/dev-python/nose/metadata.xml
index a92a97fc50db..e00e1107d375 100644
--- a/dev-python/nose/metadata.xml
+++ b/dev-python/nose/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
nose
nose-devs/nose
diff --git a/dev-python/nose/nose-1.3.7-r5.ebuild b/dev-python/nose/nose-1.3.7-r5.ebuild
index 0b0eda13af04..5e6c66c4065a 100644
--- a/dev-python/nose/nose-1.3.7-r5.ebuild
+++ b/dev-python/nose/nose-1.3.7-r5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="coverage examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index e649199ecddd..99cd557a56c9 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -10,5 +10,5 @@ DIST notebook-6.0.3.tar.gz 14048151 BLAKE2B ad4e433accc90acc13efc8005146dd8bcf2e
EBUILD notebook-5.0.0.ebuild 2212 BLAKE2B 084e83dc0e77c008455afba813e376996fec0b22225c7a0b1e444f90e47922c0401fdfd16829e662d15e066f023239ba768a5c5f74284cbf5d21f7b06ca225a6 SHA512 3c8fcd5f09eea10d10e8726e7c60fb2dc69b6d1da393ea972318202f991e47fd92a4bf2f5e0e0312225670b494e219b269919cb9ec9aa173caa6df4632097cef
EBUILD notebook-5.2.1.ebuild 2481 BLAKE2B 82733e9825422222c2ea37146741ec5d510d7bddba8f331a074eb5ff8893be9e2b25cae279e519a43205997b1f2ea4a549baaac42b36d74060602241795c9fe4 SHA512 7ae45ff9d12cac19894432e8dbd0ec1fbdfc818bb76bbdf67cf91c8b19d1c79acf0bfebfce550b634529974201ce214db52018851838b47e8ba650cb48c157bc
EBUILD notebook-5.7.8.ebuild 2965 BLAKE2B b2cec1042caa14371ffb788d8380410131b11d4d6d62a2f248011227edeb741444db7c2fee142c2800f858e15e75cd035e4072fda9f67ca3e03d337bdc1d164f SHA512 514a170ce702ae495a6f0aff2b0c1d8aa467d00f7af69d27a54c891139d9ee258ab106ba99c4b3a6ae4afcd7dde677ef7e8f6289cfd576dc0c0ec94284cca1eb
-EBUILD notebook-6.0.3.ebuild 2371 BLAKE2B 72a81edb848bc1623ba651aae700e751c439abb3c079ef33e843972817e86af2e897adcbf0dc221726b86a1166c31d79fc8dd6925eb14b268e62fac5b879aa62 SHA512 856dfb48af215bbd61ed8aa757de218639d327e87a3147649a3d374f6fd4363c6ff07d54f7480111aa154a556ea08cbc0fc97dc0d044cd1ad5c58b0da3b53c7c
+EBUILD notebook-6.0.3.ebuild 2370 BLAKE2B 3ecac4645f6972fc98902452616fc2815aff2862600cf250d14e7d77f0420dda3e434263df5ff695952973c3238cd04c89f2890ecb0c91c7a6c3810f56633a44 SHA512 893968819f44a80f05847f8702317ad18de88f5e5652fb478a523c0e55ea6689c654a6df0d0ba34c20deee159236b212219cbb6fd6ba403f6ff9a3b61883fb1b
MISC metadata.xml 441 BLAKE2B f744bd6821b3c38aaaff373d5e44b8b84d35bb50a58e1fb6515cc580727a29240a2394c0d6a0c846dd76062905a8de7d75faf96ddb0b23a0bc05b24875918013 SHA512 4f59ae02210d5df4c6416cdec8d85931577e931e885fe7807967ff708a7c5436fe246e152f060e99b0ada2665e8a0321bd4382640680a892ad514b16926351f7
diff --git a/dev-python/notebook/notebook-6.0.3.ebuild b/dev-python/notebook/notebook-6.0.3.ebuild
index a92fb17d8b10..027c65c0c069 100644
--- a/dev-python/notebook/notebook-6.0.3.ebuild
+++ b/dev-python/notebook/notebook-6.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
RDEPEND="
>=dev-libs/mathjax-2.4
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index a04c35ec7f5d..ab10c4571f17 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -12,6 +12,6 @@ DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58ef
EBUILD numpy-1.16.5-r1.ebuild 4364 BLAKE2B f8d83c189cc4dda70593621135607520ed993de72ea3495f3b41bc5a7ce2d39df3e92ac8f60e14a32cba17e062a97c45bc8c975e94c09a4213b4651f9c0d78bc SHA512 cc185d66671c12022ef77ad93117b01035302daad8bc71409e43ba5ed90ff1453b7ae05896aaf085fd94eee7abbd572e476e11996e16106b2fcb265aed274d73
EBUILD numpy-1.17.4-r3.ebuild 3692 BLAKE2B 3066645644584c6cdeaeddb84da1ea811300e8f7df77efc643e39461253451fb3008d9194998db83f13648e1e79a6b06c85bc063678a1b76b1c3acf051583502 SHA512 622b8faddb286e75b85ca73cad6946ca6fc2fcf78f38bc38095ca0a0e038cdabe104681b51e093f6b1ed27602d5088b2f036494c217045368a0e3bd0ca7156ce
EBUILD numpy-1.18.3.ebuild 3734 BLAKE2B fb067fa06e1341dee3f64bb41caaf149d96d1870b1c6911af81859b257cf1b2ddf3ed21833255345e63d89202508e812a9263a281878268422d018ce0926521c SHA512 148632766a283427b693670b7d733138ef9d119bd640db4ea04d0858a502e7befe0a2328c261ce692368cbee77581c9c2f3d5a75f0b741ecd9353194afffc381
-EBUILD numpy-1.18.5.ebuild 3732 BLAKE2B a15e61aad8d59be4922c7cac1af1cefc77912fcbd9045980d313f4671d2bbdc4bba98594b1df9f616815b346d628c678da3f3d5452a25089a9625be419e5b74c SHA512 495f6e4e44d812b8ee8d9838c640409a5f61b772291e2f93eeddd6dd99144204fe3d011857100fd9a18b26d091b67fd8d5397304450215d5803e4a88b33fef97
+EBUILD numpy-1.18.5.ebuild 3731 BLAKE2B 9bdebcfa4450f6b265971321afe2cc129197a224734f2b71d09d6e9c7d379a7e8399247a62630fe82e54d46d9a2d2855d546585774f6531c10516a8c0254d9b6 SHA512 a56c7b01c918c1d081a8b466b112a64bb66bcd60c4c0f14ff079fc4a25e9da801f45bd0c8a2289a0e8e0f4d13801cf779428b6d57d56981475643ae35e642189
EBUILD numpy-1.19.0.ebuild 3734 BLAKE2B fb067fa06e1341dee3f64bb41caaf149d96d1870b1c6911af81859b257cf1b2ddf3ed21833255345e63d89202508e812a9263a281878268422d018ce0926521c SHA512 148632766a283427b693670b7d733138ef9d119bd640db4ea04d0858a502e7befe0a2328c261ce692368cbee77581c9c2f3d5a75f0b741ecd9353194afffc381
MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.18.5.ebuild b/dev-python/numpy/numpy-1.18.5.ebuild
index 162bc5eecfdd..9b53d6b7d4e4 100644
--- a/dev-python/numpy/numpy-1.18.5.ebuild
+++ b/dev-python/numpy/numpy-1.18.5.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
)"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack"
RDEPEND="
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index 1f60193abecd..0f0d787b8e73 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -4,4 +4,4 @@ DIST numpydoc-1.1.0.tar.gz 609482 BLAKE2B 475be835a760dd148b7132a3149a1b79193425
EBUILD numpydoc-0.9.1.ebuild 782 BLAKE2B 8c0c94fdaac4280ce66502dcdc254de03a8d33384586be2efa249728c93bae31a655f90869d33ee518ae8bf9edb97b56de4785ece4d076caea896efa6bfcfe03 SHA512 4bd71ffd4a8fdc1b61e853d39773cf1500933df899abdebb9fe4cc57bdbbda91e7f917038caf548abd9710bb58e6f3499e3db62fa54eaa0681fde58ed4483010
EBUILD numpydoc-0.9.2.ebuild 598 BLAKE2B 37a54df7e8838af8bfaea968cb0953aaaa923d6a4ccc3bbefbb389953d11856decb7c6615386c1e36f8cbe2f3caea5461313ba88b80e6a12f7083e7c7346705e SHA512 793fc4c9ceff3b528a82ef09f1949d337e87ee7627a58e90d649d11dc53cf684e2fccef501603ebc0c82ac530e0dcb527941f918b81257f555179cfd777bb05c
EBUILD numpydoc-1.1.0.ebuild 938 BLAKE2B c296f106a79cb3273c4497b1fac8e3c07639481b9bf7a009bc590cc1957c31b995f70bd99a441a0e757bbdf3b3ac0ed183f0775adcd93e7e1eac46f8cc372e68 SHA512 5b6b5d0ebebf70a0362f22b597a6d7e075ff0e67c5c0fe23ddc59d86a6e1d534d87b7ef208b5b929d8c0cdcc78868c42aa01e9e0bc682fa9dd31b4942cfed1a7
-MISC metadata.xml 321 BLAKE2B bbd5917a97e564f5abc495cb2632e42ab36ac1e2441be7c0a375224af7be481b00e5b8e60b6762653401021104b0094903a62eabe9a221020390a74753fcc258 SHA512 51803da4bebb8d1ac7fcc0e33ec99234b4f497a2817361032712c35ea57e9e58591fd675c9273d7627f94c60e010878b9dd6a6e8708704f36c945344159880a2
+MISC metadata.xml 346 BLAKE2B 4cc694f3ee24d59fb18bc7d1ecc4b2cce5931d450efb57b75765c2762a06ff10458f55a4c472a75ca6d64e4e1a79dac0b5ed610e4963f52498ab4a3701d18ede SHA512 737d553f25d503f5257b1bfd36bf295a528e600070b00cbe5b0fff9c1fde9f967c89b5be92968b2eef617bead31780d7cad4a0deb419f0a816c806c2a688e9b5
diff --git a/dev-python/numpydoc/metadata.xml b/dev-python/numpydoc/metadata.xml
index 03512508d0a1..d1fd3820e131 100644
--- a/dev-python/numpydoc/metadata.xml
+++ b/dev-python/numpydoc/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
numpydoc
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index 14f403133881..28d34fffb8d8 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -1,5 +1,5 @@
AUX oauth2client-4.1.3-py38.patch 1782 BLAKE2B 751b62649cd7222230f809c7e957636e351cddb3588c1da112443b09067c73cc6ada588697dd36f9b6ed2115238f8f811bc5502b17c75b2f65be655b4199dc9f SHA512 3e03d7105e76206e63858a32a25dfd5bbf997ced6abafd75d0f4973528ee91cb28200854ccfa519945573992f454c18d2acad5784693acffc7509ddcb13908a8
DIST oauth2client-4.1.3.tar.gz 185589 BLAKE2B 6cd61448e0d55cef7f2ba640c8cbb50ac83e76d0993391eb0acb3e156f937fcdee80576c9d45d505235a9f266495069664ccbfafd649a4e2d7a0990517ee8cb6 SHA512 80f49e09a6dd6767307a2c278544926fbf20b4f55e4cf83563ac7a7c1043622bd3c8c7fcf6de62896b623ca8c7947b309a5e6bf2b7cb0fccff3ff7634386b287
-EBUILD oauth2client-4.1.3-r1.ebuild 1813 BLAKE2B 1171899000256d0f2da45c687ffafb7749d061ba1c0c8f454b9c00c4decaec3e57e8d6dc4e1340705d886533240fe3267c1a09a7753939368f5ff750c9dfb2f1 SHA512 50946e1f0a41b47f792b5018ab22394c8205273190834b91f3528f2f1b6dc0676a03d9f26863a2701a4b1efd01149218936630109ddac66764a736cd4acc66da
+EBUILD oauth2client-4.1.3-r1.ebuild 1848 BLAKE2B d420d40c7ada60255ea9a3a85e7fe658e120eaab3767e3e264bdfd366bc825c32944c8740a93867a9fc772d7eb6d76cfe71a9afa2fc0713c0388472e6b2c4b1d SHA512 aec3692c56ef82d77980d81314ee032ed26c9e79fdb328693217a5b90b2a2f4befe6a45266bb0bca57f51f00e442fd52f38ea78c179496ba6963482f91986d71
EBUILD oauth2client-4.1.3.ebuild 1683 BLAKE2B d2b335f5dbb376a877641711b27aa0be0f3475f403fc110219cf66114dea7b49d658eaae8fb28a2174710e8ca740aa20d2d560d6fdcf33801afb9e434ebae14f SHA512 e93763a8b6fb6944123ebb1fa52fdfd0a3e591dbd68cfefdb7fd6704546753cf5e84d20872cda9eab21a9629197699e63424dc088019ffd548c5626ff1dbb3e1
-MISC metadata.xml 338 BLAKE2B 83fcd745b218d67169e4c38046821df108a4fe02d6ea671ef3ea5a317b21499d20ebbfb1d0575e651c34ccf9c907e281bdafa98c6cbde62eb5df86ce092b9285 SHA512 2148a99b18eff64225de89dfe5de617b5584423483a6265f1f7247adceb62ea53b3dabe2d185ff51a535494e81bdec3dda2de59c83320ce1f4febd665d101a3a
+MISC metadata.xml 363 BLAKE2B 7c5e946ba58960ecbb9458b57dde2175f003d827f4178c51c2746053333af96d55d973a81668d7bae5c7d4e706e870678da540467d23b5d43c020691552314da SHA512 4058fc7b16017ed09f27da96d66e9d142dbffd476c8c7d4c2b31127ee2dc43b002e0f431391784465101a329d172bf7650c5ee42e09a1edd21c11be8a191ab6a
diff --git a/dev-python/oauth2client/metadata.xml b/dev-python/oauth2client/metadata.xml
index 9083df5a2ff2..84013d57af40 100644
--- a/dev-python/oauth2client/metadata.xml
+++ b/dev-python/oauth2client/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
googleapis/oauth2client
diff --git a/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild b/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
index 3563b832a5a6..04d4bdfa13b7 100644
--- a/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
+++ b/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${P/_p/-post}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
REQUIRED_USE="|| ( $(python_gen_useflags 'python*') )"
@@ -30,6 +30,7 @@ RDEPEND="
BDEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? ( ${RDEPEND}
+ dev-python/flask[${PYTHON_USEDEP}]
dev-python/sqlalchemy[${PYTHON_USEDEP}]
)
"
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 21c70f94f338..25bddda45c58 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -2,5 +2,5 @@ AUX packaging-16.8-distutils.patch 447 BLAKE2B ee667f6aed01fc273092b896acafc676e
DIST packaging-20.3.tar.gz 73015 BLAKE2B 863a04124543d510455ffd6cd6974e7b3ed0c43e02baa5124631e24e7d56017d0289475fbcd9a4f038607c4a13aced32d2b98a82d975903afa154b520feb0019 SHA512 b27ad6f72bfe0965a6e6bff78e4e37d4cbab73dc0a1b019673c85615c9d99edf237effeb9756702c6e8c1575a2d981f6d1af364c73d0a451fbb167d64678630f
DIST packaging-20.4.tar.gz 74402 BLAKE2B 3c667c1605445aec37d264ec3846a1a6678f13a12aecc09a6d16e09ea27041fcd65d23538acef4f6272ab0458ce479c42906b15cb6eddd9c8001b1970c23e4fc SHA512 d53912041a9950efb5d221fc968adc328c2ef1e54ec9806d2158fd6db1b170e37afb05213f5750b10c59927504083ca3781c958caa0c802b1c7c0fe1ac1682a4
EBUILD packaging-20.3.ebuild 1404 BLAKE2B 214c4582408bb5621afbaa34f4e0cec6b9ab7863ed5f209b45cbd2721c5f1bc41055539a7c453371064d37b19d14daedf91640285bc8c161d7acefb633d249f9 SHA512 b96dcc379f1ad70766d28b3317eb340512fe8d18becdcf9256183aaf86f2e8bdcba8d39a492e53269a04f3ab0f801501dbe84570506460e0269dffca306b2424
-EBUILD packaging-20.4.ebuild 1415 BLAKE2B 3f12a177e0444d48e6751969ea8ac0a4cad274af23ed7d16a67938e4a0bf243a39db36e30935a90807a238da6777743b40aa9a5fb09e0d1f9dc248fa5e96fccb SHA512 fac44e8d0f5fa8335b218a08f0fa8049f6d5a812eafb13732e34b6179d43a10dfe001f1d4be5fb299dcb94cc07888091c777254b4257d7beb01b498d726937c9
-MISC metadata.xml 366 BLAKE2B 62088f9e06b99999bcb0082f1ff6d6e243c8502a7e3f399699cded85fa65395f558e019b08342c73e4f078183cd0732d88058fab8fba984ba0b531c19ff6560c SHA512 f326b75f4603bc9e4455665dd526e381eb1973c8edc319e1d69b824f93ee885931fa29e74f9da8582f5af78a1ddba2fcc2d983fb98cbdc4cfd87b82c7a0f3ba4
+EBUILD packaging-20.4.ebuild 1406 BLAKE2B 9b948feb8a5976aef30817d0545c8e3e6cd551ccb41ce8f5eac1408d8d9f0d87d443a07616746cbde4e16ab48bbec9819d726c2bc891b045f1d4443ed5858e09 SHA512 99f1ac586b369e123fa201ec4c4a0235ffbaf472dcf4159e0b746d61488beffc4da7f899f5b39389f504e3645201994a54a046db306448ae4e475a2e8d1df6b3
+MISC metadata.xml 390 BLAKE2B 98afec1f8a7889d12e1a44ef1ff2bf1db635818b7fcb8d86dff0d820fc8fc92920615cd5de63f35cbb6eae6c29f8d6942807f0a7bd48b320c9a0d55a7fa0de69 SHA512 d082f5d387c5d71f0f6cfca4572d4637081daa863186d8b05050738269559617b910c95de97ac3eddd41434cc528e34597125a6973b7b239734c91bb2c588235
diff --git a/dev-python/packaging/metadata.xml b/dev-python/packaging/metadata.xml
index b995a0f3bbcc..5b75b7a3b0e2 100644
--- a/dev-python/packaging/metadata.xml
+++ b/dev-python/packaging/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
packaging
pypa/packaging
diff --git a/dev-python/packaging/packaging-20.4.ebuild b/dev-python/packaging/packaging-20.4.ebuild
index 37353d3203ec..a9225d1e48c6 100644
--- a/dev-python/packaging/packaging-20.4.ebuild
+++ b/dev-python/packaging/packaging-20.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pandocfilters/Manifest b/dev-python/pandocfilters/Manifest
index 8daa4038b12b..9c3c466e2b8b 100644
--- a/dev-python/pandocfilters/Manifest
+++ b/dev-python/pandocfilters/Manifest
@@ -1,4 +1,4 @@
DIST pandocfilters-1.4.2.tar.gz 14229 BLAKE2B 8d061435fc4368fe34f30d7ba7aa06a2b8f3bf94a94661aa120d3b0e9a3042e64bfb8f81a8731470417e436f52342b3a63ab4bb3144349ec9aa983cea9c5d4a4 SHA512 5e5c0fb18f163430e87750b88d38a5f0fa618b90c84bf08e6f295df3ddd46c1bbf35ec51514af8d6699c7dfc9f0b3ee9edd0484deeb05e5efb3b26e650b5ee1b
EBUILD pandocfilters-1.4.2-r1.ebuild 413 BLAKE2B 01f3da985164860a54e1ae618978abf04c57aef3373dd9820791124a551c9b033e69aee086856991c0f67c944b7a9ef74f83a351a6214c488b42ced41ebcebe1 SHA512 4df88b12f39b9ee0862a244c22189cc71e4ac142683980311151c09444fc1bde0e95c1f2d8d772591850009df68a51ac9d600842b024f109cc6eb5a6b8d09f32
-EBUILD pandocfilters-1.4.2-r2.ebuild 416 BLAKE2B f7d8b43c3af1817d1766a0ed357e5d162d9acc0715466df225407fd7d1fcad5a92fc466a6cd9a1b1beaf665310d7bc85504b2915c56165be7d0c6d8ab1ea849f SHA512 d3dd2e7aa27f68ed6b880b6712fd9727b173fb1fe20119497038ed90e1cce87e3a9e65540f1d1930ec1b710df271451be32627e51598f1a269081891341f9689
+EBUILD pandocfilters-1.4.2-r2.ebuild 415 BLAKE2B 6ec281eb4cc67d38b629e1e306a98e4d377a5c8de50767581cc44188b85a401cefa7a9429ad1a54c4fddd1145754d9159d93ca16d597645c3c05e7adbde15fb0 SHA512 577fd1c1a1371e387e77a147c72ddb4c834c0bff9f526bb2fba010fecf949a31be26110dcb2c63371f42995d018e66e2f36d469adff27d337dfab9e08a2a6722
MISC metadata.xml 505 BLAKE2B f15a208579a5dbc0a4552fcdb95eb47e454169bcd4596450e4ba40c016acf0c0718cfb1d7510c4d47d5964c4dd5bc38e9d67250355ef2c057b1d07e189ee6e03 SHA512 a70bcab9a4cf50dfb414d61844c258ee674c07f54fb63e238240f6ba75d9b9bac17f2c0008e09bf909a277da4501ce9f56ec66234216187497160c40fe90ade9
diff --git a/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild
index f0ca1779097c..d53f71af26e4 100644
--- a/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild
@@ -13,5 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
diff --git a/dev-python/parameterized/Manifest b/dev-python/parameterized/Manifest
index b315e3e16e67..e0ce588b4c90 100644
--- a/dev-python/parameterized/Manifest
+++ b/dev-python/parameterized/Manifest
@@ -3,5 +3,5 @@ DIST parameterized-0.7.3.tar.gz 22678 BLAKE2B a0332af2bd8c955993bd9520538efced1c
DIST parameterized-0.7.4.tar.gz 23389 BLAKE2B cc1ac334c0209a7471799587e1d35f6d8db84df91f559514bf3067ec8b2110948a6148613efd1d0111a65d43c52f7be16ab56cb69dca339fe7049f64484b7889 SHA512 71c51ad57900f5b1b6f4866c60ba4d23649df7740e7f7e735a2e0faf4810bc8dc552a1647da8c174f8a0b80db7de5727ce24dabc9fee6b4cfe12ee98c18945d7
EBUILD parameterized-0.7.0.ebuild 578 BLAKE2B 3f191fa2d7a2cfbb0b654def88086d932c7bd0cc47c5e42768f43c8c04e55b36faf5f7ad68cbb025adbd5ad0981dad50a3768024495197e7f25ec3de074d5aa2 SHA512 6c92e567699a82d2c8fc1f857dd962c7692795171e6679b37a88fbdeedecf6112489ec627157221f60b82395b8c628189dbc6dd5a452feaf8382fdf9cbf888d8
EBUILD parameterized-0.7.3.ebuild 417 BLAKE2B 554729276a8d12504841ada00a5386c08e427a6856eb65acc14074bf8d6e22fd4642c39f13853ad2466840c71d00871353c78e7ee3c69a64260aa5a368e4c09f SHA512 fc5fc89af92ddeb839ec9a21fe14b7f5a5f7027081c3032e006c9dd1d8266013ec12f54d2e4619d0edd7e790e7e6b2e35a82d3162212cce65afc4540b7c6ef87
-EBUILD parameterized-0.7.4.ebuild 415 BLAKE2B f424062be98c9be2040545b2e8f33bb458f5e2f5a8b22a477a0252699b6fc46a1713ce973b472494215cfb021e76bb18209c5ea2295ef5ee8086c3ebfc30b4e5 SHA512 37c12aeaff8ea58bbc45a2d7d9bb6d43b99cd6903d734d91efe71e066b4168b717b98447d97081e7343f204e525a77e04993a8dc749b21cbc1367fa9479802d0
+EBUILD parameterized-0.7.4.ebuild 414 BLAKE2B 9f4b124d9f6e2ec3e13f059b838a3a60fb271192175e58e71b50c114a0bf0fa901869b469f10534b5ed2500a2a71e76f81a4d88b6dc11b3c1cc89544d1c46694 SHA512 fad4d07172aa822788db0b2da79556eb9da40decf63b43394db3676f1c7f5c563adf11a9ffcdb123b716f37e7ea5d34ec1f37f5cdb332641eb88ac7f3d814e1b
MISC metadata.xml 217 BLAKE2B b4bd64b91108b5009484a426472b93c0ee864691d060218864452d2e504b491022d3d7bcc4b57ad0b5e5f2e01b1fba019e8f63eb79b4db8dcaeb505593ffa2ba SHA512 9611c83ea0155f3d39afee524c6425ae6d7e07cebc4ee489a45e39ab80e97fc2bff56fd9a8d97536a5bc415da147eb587b20ccffa5baa61440df65bd26576e8a
diff --git a/dev-python/parameterized/parameterized-0.7.4.ebuild b/dev-python/parameterized/parameterized-0.7.4.ebuild
index a402f340e284..58c67dc284dc 100644
--- a/dev-python/parameterized/parameterized-0.7.4.ebuild
+++ b/dev-python/parameterized/parameterized-0.7.4.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
distutils_enable_tests nose
diff --git a/dev-python/parver/Manifest b/dev-python/parver/Manifest
index 2272a2f16ba8..3a95ade13974 100644
--- a/dev-python/parver/Manifest
+++ b/dev-python/parver/Manifest
@@ -1,4 +1,4 @@
AUX parver-0.3-test.patch 1078 BLAKE2B d81c48c59ec2f744c70c8dfea7ff6133c652105e933f2de77e6c50c097da5038f3d753e809d2237cb840fe927986ce1cbfd2620c629346ed8f232d7d1770ebe6 SHA512 2d4a8eec787eee57be68d57f6b041e4ae4fb437767b02568b3aa258c8853461922dd7a963fde0be134dd8cbcd4578cf93ad8eba37ec55b26733cc3671984de69
DIST parver-0.3.tar.gz 28324 BLAKE2B b7ffed6f6e03d9409ba512fb43336fa81ce4152fa066703c1de122f709410c946a1ce6fcedf8ddbdb0c9af66d8651c597f2abf3867115d89280381c6fb1f24e8 SHA512 0b31ee3c3fc24b056a97ccb9df10dec69ca66f4690b7f01ae84fbe583b77cf713b98d207eaf7a34c2192eecdf4077121154fe9b59aa83fe4836080cae729a90d
-EBUILD parver-0.3.ebuild 892 BLAKE2B e1ebb523e895c6e94933cebc0569bd13804a9fe154a5220ff565801cb4b8a058a02f991375fd1b51ca6969b61e6bea28ce983651fb0f1aef72f58c195a80e5e2 SHA512 3a4c2dd56e0db206df68c5ff835dfbe64c949dc1cc17708f143145fd395cb4da1f5c05a3532df98e89ced7cf030998bc9aef9f9144f4f4da7f18339235da1dee
+EBUILD parver-0.3.ebuild 891 BLAKE2B ffd5b38400ca8be8d7bbe227324b0dc255e88d861438226cb5273ab8187ef08f1c1b34588b5c69ca4983190aaf7a1e81f9384768d3a2841ef4744aa48a80811d SHA512 d4391faefea0927a6f9c4537f6fd709f7c06d06dc3d92ab4375d6530c244729ebc5b3b4db4a98a90fd4dff1d37b7b908cf22fd919458d14e8762f577e4d44500
MISC metadata.xml 433 BLAKE2B 816ccc76bf4592a65bb9577c64a81ad4dd6643b8db012506a931ed8420d68d18426085f9c6f13f3bf82679ecdeda9967f612571d54c6c09c0ad795246e41cb04 SHA512 9f271e8d1fdeee78d5a3c8fefbd1f9e1dfb999fcead3ae86453f63d4d9d44d36951fd7342e1512483eabea11515c729beea1041c28cac6b7255ad33522bbe569
diff --git a/dev-python/parver/parver-0.3.ebuild b/dev-python/parver/parver-0.3.ebuild
index d2af95d88e83..cfc1b81b58b9 100644
--- a/dev-python/parver/parver-0.3.ebuild
+++ b/dev-python/parver/parver-0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RazerM/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="
>=dev-python/arpeggio-1.7[${PYTHON_USEDEP}]
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index 696ac0770a93..8af628f072f5 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -3,5 +3,5 @@ DIST Paste-3.4.0.tar.gz 630425 BLAKE2B a361450597e8dce1d9cb99ce2a723cb8feb089099
DIST Paste-3.4.1.tar.gz 633491 BLAKE2B be599b9385ecad754fc431a936ccd78ee088825c88040986ddd4ccb3ca81342d642a23699ca7ef9338be5360703ce5d5a2d966ff9e405744b286fa3fe69bce41 SHA512 90b6bd33e83fde70691be6206ad1de653603900b88fade79f6960df22bb84c6e82c9b6f4ddc11406f4e206273a2b5591b81ca034f8f42a3e993b85b16d07e3f0
EBUILD paste-3.2.3.ebuild 1745 BLAKE2B cb42e4f7bd28c8dcc5c07489e88cde91e55d2feccec1b6365dacdf82b7925346af2b2681dd9810871888401d203b1204613797444808cbbf4115320b9c0146f1 SHA512 b08100e21b05490c82fa64bd87f460ae55b1f298dc4bfb6885bbe4431ddf3d797739a9a40abe144a0685fefa9fd96e2241eebbf7635ba681dbfcb2e853b38d29
EBUILD paste-3.4.0.ebuild 1113 BLAKE2B b5c4e17c21b8ddce564d868f7f372b82b847ffd20987e52ced41e69d8a354cff0fa3989f3c292c83c3e023553afe4f24d7f5c3e0bacacee255b7727934053fa8 SHA512 3b9ab839d8a7c5a09c3ed81b5807619885265008ec853652ed1c9363c671966a1ff9116d0880e365a890954201623691b7f4c56100610fc25f2b07c4f93c9bb1
-EBUILD paste-3.4.1.ebuild 1113 BLAKE2B b5c4e17c21b8ddce564d868f7f372b82b847ffd20987e52ced41e69d8a354cff0fa3989f3c292c83c3e023553afe4f24d7f5c3e0bacacee255b7727934053fa8 SHA512 3b9ab839d8a7c5a09c3ed81b5807619885265008ec853652ed1c9363c671966a1ff9116d0880e365a890954201623691b7f4c56100610fc25f2b07c4f93c9bb1
+EBUILD paste-3.4.1.ebuild 1105 BLAKE2B 2faa0fb3c7e0b84785682e17b74f63062ce9260cc0a6c92afcfedf7449a82723ea53d98057b806ffa2753a2e577a1d03a4348f21f003c6e5a27e3c0077f5a812 SHA512 bd5ebe9e26dc2ba281a74fd12f72fbc1b62aa22116eac9d8499b11254bd9bbcec53fd21eb4e6f3ae430106d15fee820467708996a7eb6f20856f31b7eca96420
MISC metadata.xml 802 BLAKE2B cb355da6c4b803a1777a5fdffe5c262d65d8580a0ac902a79ff3f631037ec16a8865969e5a9ea663c97960e5e52370a438b700148c9813bcb535c8385f588fb1 SHA512 44f4ded1a14298d020ca255a48d26d63cd2c1915e537c45718f630710caaa00453059bfe0f615bf3217db7d2b81fcbd419fc67e8b56ce6096c5844d53c6ab94c
diff --git a/dev-python/paste/paste-3.4.1.ebuild b/dev-python/paste/paste-3.4.1.ebuild
index a86c3a7bb14d..af022aaf146b 100644
--- a/dev-python/paste/paste-3.4.1.ebuild
+++ b/dev-python/paste/paste-3.4.1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index ce1ba3f63dfe..22c90928d655 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,5 +1,5 @@
DIST pastedeploy-2.0.1.tar.gz 32215 BLAKE2B a398c54813fa990e3f12ba7c66615e3e84e848ce0dc57177f7f76114a544a11f89569ac85f16afb1ee392a08ad06eb6b4f0cc5aa3f328d154643c541fcafa7bd SHA512 be50c434765d5a913f9456527a72bd88e778e947b1db99ee4ea2f3325366038d941bdab6c826bd61f0c1eb1618395e6bca2081ac99b5ca50aa7120406d5f4ce3
DIST pastedeploy-2.1.0.tar.gz 32240 BLAKE2B 1672e3b48a287f57e9e7fca082e4cd07cea770db1c2ae0012a83dc8ec927d83bf94461a69c7afdbed082c72506eb46c0c5db15e5f0bc24ad7a4212efb9f6696e SHA512 2c639b5ad07faee013ff3fe37d0e3c6ca7b56ed0960dbcaf133c05d51a7f29d6a2f35118bd8faea4d9aca90438c43d8046a340833878e4b925f32142df169c97
EBUILD pastedeploy-2.0.1-r1.ebuild 990 BLAKE2B 673eeb039807627b3d51f82e373cdf270bd30c3a3068f9c876ccd48cda0c3d6fe49823170e7f5749cb9513ba8e77d28cd0d66cdfaa9be09d2d5881747bd3bd7c SHA512 ebedc4fd7715ee8c8922060d88395de237e4621c593daea95a358223562f47b530287bc623884c735b4a89c51e73332f40686db3b45b395de803a0b0811a21c4
-EBUILD pastedeploy-2.1.0.ebuild 999 BLAKE2B 8eeec1ec1509ca41faca4e60d797089b7ab6300fe01380f553dcafbda2ccab398c7ca6f41c5504c016f1fb03123292c3f952ba72534e70814ee105d21f862d0b SHA512 87ddfd458cf24432cef50441b182e8ad84d37b13e4b82469f0dff4be316dd05019c63d1d9eab931853c26ae31ca036a49573535193d06b241e5de1e4113b7b5c
-MISC metadata.xml 806 BLAKE2B f945ec7a43dac81abc59fa63d078872fe4bbd9bf3945ca0f03b4d78bb2511bbe137ef8d01424c5c54a55b73f22778dbd9efa009ab64ef41a20d55bd71bb15e99 SHA512 da770a4fe1f5918391fa4861dab525dcee34d5aeb362a464307c6c8b32edb4731effd22339056f01d77eea8d3729d3ca57572d1d95ebab8b786cad9029250f7d
+EBUILD pastedeploy-2.1.0.ebuild 990 BLAKE2B 673eeb039807627b3d51f82e373cdf270bd30c3a3068f9c876ccd48cda0c3d6fe49823170e7f5749cb9513ba8e77d28cd0d66cdfaa9be09d2d5881747bd3bd7c SHA512 ebedc4fd7715ee8c8922060d88395de237e4621c593daea95a358223562f47b530287bc623884c735b4a89c51e73332f40686db3b45b395de803a0b0811a21c4
+MISC metadata.xml 830 BLAKE2B 646965e3c4e9247a8299b8e3d441e3a80a899107e14489cb1e7f5c85bef9b4c710536caf7cf6f695e9a87f0412cc47b7099312e7e7772691a275c3c2151215c9 SHA512 dde9cd21ca86242148ab89a2e77c88c4f7ec30c1615831a2cb00b20f0051dd23c40537ce1abea7ebeb39da4a8233275f0d3dc91a8f3947307d7acd571f56dd29
diff --git a/dev-python/pastedeploy/metadata.xml b/dev-python/pastedeploy/metadata.xml
index c40531961758..8c900f601b35 100644
--- a/dev-python/pastedeploy/metadata.xml
+++ b/dev-python/pastedeploy/metadata.xml
@@ -11,6 +11,7 @@
or a Python Egg. For WSGI application providers it only asks for a single,
simple entry point to your application, so that application users don't need
to be exposed to the implementation details of your application.
+
PasteDeploy
diff --git a/dev-python/pastedeploy/pastedeploy-2.1.0.ebuild b/dev-python/pastedeploy/pastedeploy-2.1.0.ebuild
index fd89fee1c975..69b46160987d 100644
--- a/dev-python/pastedeploy/pastedeploy-2.1.0.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="doc"
RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]"
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index a8ad3f4e02b4..f0c33a060f91 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -5,5 +5,5 @@ DIST path.py-11.5.2.tar.gz 43542 BLAKE2B 6b376eebf5b9197c4a2e23ee25c8261c7a8b942
DIST path.py-12.0.2.tar.gz 44859 BLAKE2B c82bfd248e0e6eb21e3416c86f7a3a5fbfc5f5b327fe20da4084c53f22834013fc224bfbcf455690f53002c8f1c3e060aa0f04f3792e749dad62e51702cea348 SHA512 97971fa1e6bcdd4acf057ab4fe6cde2edb9d9d3d06dc049ea3779cae867221ae3e9d905daa1ec706f867473f738bb328b2795d3030244f8bd8ff7e8f0d5a6b2c
EBUILD path-py-11.5.2-r1.ebuild 1594 BLAKE2B 7053427dafa0ba02665e7dc70905116f85a926c23e3fc2fa48f54595c025161ecbd81bbb2ae5ee1a9dfe4e05c150bb4491e4aa9c4948a5c9cab50cb1d1752307 SHA512 b3882b7b3282a352873c33acfd4eb2f44ece9b0f3f5a114c91be10b18cfb574c29df45fdc36f14464f021baad0bfabc774fb04f3869a0c972f98525fcac0794d
EBUILD path-py-12.0.2-r2.ebuild 1554 BLAKE2B e107da833380acd00a56844fbdc4bd11ab3c18600b198092d5eba6e95ab140bf43a7b375de6c882a17adadf8314413090aba8000e8167d9af9eec0622910ebb4 SHA512 77de4282a51a84639e479a2c32074eba3b824fb35766a05fb4b8a024c61206819a3b15f0954ad28d738a7c17b348711e9e3f95d6dfaab4b0bf70090feefbc91a
-EBUILD path-py-14.0.1.ebuild 1425 BLAKE2B bb2aca0426da6b23489a896ee03332171f77c6c902304ece9b4348d12a9788937785a8aa117e5ce45bb4a973a41cac69962d6f1e5c6d28c0c13dde5ab1025600 SHA512 3564c5eb163852c60e4e536a1dda044e45e3159594b5d23750ea783f7ee9fd978166df2fc53816d038c3e29ce03b04e2a8b15a72e18b00b704c18d1fe94930d5
-MISC metadata.xml 376 BLAKE2B a0c037397a1f2315bfbe646c139a2c565b028d0d440e4b830550a6a32fcd78415d4e9c3d4cbc0f80e5b3914dc85b1268cf101b55c7eb1eeecee004322d402340 SHA512 6273623109e7f816ecf729a7dd65ae21b0f69049343ad49b6d439312512324aa94f2d5764e2248690718a57a24a50babcf2f29813c4d45f58eef44c9f14cb9bd
+EBUILD path-py-14.0.1.ebuild 1416 BLAKE2B 855c9725a45b11734fd99bd03f5b2ecb20ca3a4aaac623380eb6121dd5302f5715b2c4e33d4136780d5b70a0d798597fb2a42d4320f7f39562ebb4eb508af5f9 SHA512 8395bb60da8df801e43581bdcd9a5b247f166e141032ee26e29714079becf7977f8f3ae713a6ff7092ec9d6980d521a6133c9c337f779e87a8313f93530ee037
+MISC metadata.xml 401 BLAKE2B 5a8d84aaf65dc91b75cd7222e333e75f9bd6654ce4f9d55c91a8d28b141c5fc982b8c8a6a0b3b4f1c04fcf05fa56b13725062233961f323383110ace44089da6 SHA512 415b7917fd35598bd39c03ec7ede5e0e13266927b73647a995abb62d56004039aacebaeade95be39a265ef3944c35f3c61145cdb2100e563d8125753547bb729
diff --git a/dev-python/path-py/metadata.xml b/dev-python/path-py/metadata.xml
index e51461af9e0f..ca5305593200 100644
--- a/dev-python/path-py/metadata.xml
+++ b/dev-python/path-py/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
path.py
jaraco/path.py
diff --git a/dev-python/path-py/path-py-14.0.1.ebuild b/dev-python/path-py/path-py-14.0.1.ebuild
index a9be9a3f748e..13f0dc92d69e 100644
--- a/dev-python/path-py/path-py-14.0.1.ebuild
+++ b/dev-python/path-py/path-py-14.0.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index 111b2ab171d6..267bdfbff885 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,5 +1,5 @@
DIST pathspec-0.7.0.tar.gz 24306 BLAKE2B 4256a658de2160d3487281dcb5a488c804320ec5b0bd8e20fdaf51bef8fc90f4e7fb48c404ce43508633c23d866b41e7e13cfa3897929459b244e75401b84ca1 SHA512 3171d39405eb586945261b11781b966e0771649dd7caa8f8a5bbd26223a37931c17bd50a4706d603a637a10460e9b3730c21f0eff7dc92d7e73ae570641a900c
DIST pathspec-0.8.0.tar.gz 26256 BLAKE2B 3d4f2238c515253d83bfd17a2f3319e38024d4fbb22fb0f078bbcca73d3aff45f246a35752c4039b0d88f204ae49b4467b2d9e3b9134e14a7a171895dac770be SHA512 e0cb1883d11506b3d11963397db98a0fd3411f56df7c3e2ab3ac44116ab53977112bb51d1918591afc48b9c08f9cf997d34beba373aafbfbca2aa8749ffaf6c8
EBUILD pathspec-0.7.0.ebuild 592 BLAKE2B 6af70c12c31fe864c19efa8ad8b519cd4dd201d86d81624c2617b1ee962cfc75a33aa2008aa1bd1ca2aa83bf9ab8de06188e1df6c6af2123d1477d8363f9cba9 SHA512 864e76e69b755c6cd91754947da270f77808c6bd2bc679fc712bd1759ef651f95b316ca4f0d1469b16318dc8a3b4af65bdea49469eea4e434830c3160e0e7942
-EBUILD pathspec-0.8.0.ebuild 555 BLAKE2B f7a8350e4fab1e9bdc35e87a9a003d9eb05c905268c54c6ca3e92c13f6537703de2840e06ed79558c723b2170bb14a54e0f7d4312551a1e59a4c3473acf0fbe4 SHA512 b01b3d98a3e2aea29fd0c96f92db42c9b81bf30dcaec65c96ac7092b3096faf46143ffc3742a58c7aa36d9012ac6c4d1dd40e1dcb8a7ef6b37b3361101d5af0c
-MISC metadata.xml 396 BLAKE2B e76022dc2c60ab84694cf449d56709db941649742c430370395c8389ab302c64eb5074db3d16c48195e9e36ff40d1f873919582cead9c39ee584667fbcff1b3f SHA512 db15dc438facff639ab3c1b32cebaced718c3a0eb7edcee5477e0688589d56f48d55347a9679b043d551acd9638b601738c947c2072043d0aaaea34a3f4d2eed
+EBUILD pathspec-0.8.0.ebuild 552 BLAKE2B ea444f35a31982cbb2d51ce98b3658ce7f93cd4a5cb577af1496500c88dc5bce63962309e2c6fc912c0d9235365c29aa2bab4db16930d217d5393a343f694f7e SHA512 c0ce29de93f0108348062ccfd76acd4a2f8ae741b1bbe78f5e89d87816ffa8812385982ab1d8224cca557181212ebe4a70374b81ce3609bbe1698c7990b83e2a
+MISC metadata.xml 421 BLAKE2B 388eb128b62746868b4ceabca9cc533b64ce5d5cfcf5fd70b235b2e3f569148b8de15443dd9f7406ac7a050dcda0e73999f3451ea51f8a7b7ccf979115ddcd32 SHA512 fd54f8bd2c7ef1515c4f4dc936b7de16c8efaa5c81e0ce313c719172d61874455c342b6c4103b5528cc423624d04cd236aa795d5adecdaa106f7f42277e5ccf8
diff --git a/dev-python/pathspec/metadata.xml b/dev-python/pathspec/metadata.xml
index a3135fd46ef2..d92a5fd71170 100644
--- a/dev-python/pathspec/metadata.xml
+++ b/dev-python/pathspec/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
pathspec
cpburnz/python-path-specification
diff --git a/dev-python/pathspec/pathspec-0.8.0.ebuild b/dev-python/pathspec/pathspec-0.8.0.ebuild
index 0e06f11927d2..a6a77236c4a0 100644
--- a/dev-python/pathspec/pathspec-0.8.0.ebuild
+++ b/dev-python/pathspec/pathspec-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
IUSE=""
distutils_enable_tests setup.py
diff --git a/dev-python/pbkdf2/Manifest b/dev-python/pbkdf2/Manifest
index d044fdea4e2f..930556cb2b22 100644
--- a/dev-python/pbkdf2/Manifest
+++ b/dev-python/pbkdf2/Manifest
@@ -1,4 +1,4 @@
DIST pbkdf2-1.3.tar.gz 6360 BLAKE2B 0a449b593fb1dddd604db687dab1fcdbeae37819dc17d7a875d8f592b1a45ac16903a77de46b72d87fbc2d41217f044046c4b4cf3a10b579e4f21e151d8512d0 SHA512 1297950d045f9b56f5eb9f771fe65091802c1f12f090a8a80fb5e36bfa10f1c1ac3b9dc8088f4a640b840fb7073aadd3fdf39f3979118046ba5cde477d071244
-EBUILD pbkdf2-1.3-r1.ebuild 516 BLAKE2B f92a81aa2c15d54221bfbf7de7f3160d8303e6c57f46ef1bbdae3b859cdd5753d3ec76a89e0d2b883ebb4ba3d25061da9d988cb192ee29a333052e662cc61ea0 SHA512 7509f0b500a94f72b6a03030db54b1c1a7f486ebb9235b1a8002fb248790046d312a57a290fa999aac53e57bdb06623ff5a3f331497c77046cd09166de80f3cf
+EBUILD pbkdf2-1.3-r1.ebuild 514 BLAKE2B c8ad4c860528acdfb4f9e0f62ee59249dc85a81bc21d04170144be4ababe1aa5b7b94514cde0cf8b178d0d2475e2ae56ba8a686494956aa47dd453ea76603c8d SHA512 19940beb297cbb102a83559ab8ba9c5a20e05744479c7ca9349f44ce3f2624b3f5272fb398919f7bac33080981396a4ff8746e745f63b1b9645cb9dff2f5ae6b
EBUILD pbkdf2-1.3.ebuild 554 BLAKE2B fb57fca27f52f8083b0de8360858a5ab61aee0c02d0f7350e7e4a111f0d6664570e84371cae1b18eb0365927b1ae284ee0ef4a4020808c3b2272aced7d116916 SHA512 01bc93d2e57b5ac6277a504e36b2104c3f0e9b851f5c43480bf5948f3b16a0ee200306aebc3308c72296f33998b3f3265bf41554071d04602bdae506a2a4a64d
-MISC metadata.xml 459 BLAKE2B 965991be60210f9e930734bce65864e787ce89679cd3022cc4bf8b0fae52673d38a27c6e44b4f809df88eecf7408adb248cb232399e3377974e8af91184c206f SHA512 698082fce3b94481fefb400b8328018726c7c0151f088ead749fc0e25224852cdce344947b9f084011e216918237aed988f39f6ceefe60dc86ab6e1859583136
+MISC metadata.xml 484 BLAKE2B 4ce23d6736927047d0ee59c636e9604083c545fc1680ed90dde2465607a20993d17754025f4bd4349e290ba92a9ef34968014e68198342dba92a4cdece01f5cc SHA512 e54cdc2cc3594935b89509a992660df90735360bab5402e81169060e32ad90878d4b08adfa18694127b74970a25c011330215a0ee01eea57c0563c7fd9c02190
diff --git a/dev-python/pbkdf2/metadata.xml b/dev-python/pbkdf2/metadata.xml
index 81b5d33a3e1f..98439a9b8566 100644
--- a/dev-python/pbkdf2/metadata.xml
+++ b/dev-python/pbkdf2/metadata.xml
@@ -9,6 +9,7 @@
proxy-maint@gentoo.org
Proxy Maintainers
+
pbkdf2
diff --git a/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild b/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
index 619eb7f07504..0d3e81031ff8 100644
--- a/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
+++ b/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
IUSE=""
python_test() {
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index e0871cdd9ef2..ce3a58b41ed9 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -9,5 +9,5 @@ EBUILD pbr-4.1.1.ebuild 2797 BLAKE2B 8d178fb9f0a69b22996ea2e40d5df70086ca35230a7
EBUILD pbr-4.2.0-r1.ebuild 2938 BLAKE2B f35461acfa86271528f8b5e69b18396bdd3684dd382271b75543a739453eec3e2f8ea9885810447a3b66051303dd4af8711298010a7c70eb9f82369c5e127f38 SHA512 1dff0573e0e793ac68aefb82cdb5680595ef50800706c2e7a6e76a11e9387d00f00ce20154c9705d6cd30f7e386a95fac93922e805b3d41a99caa4e3730e1fb8
EBUILD pbr-4.2.0-r3.ebuild 3133 BLAKE2B 4c2757cacce58ed2466b58613934370998b4e9479d9a3a06e1326cb43e9b02d5171ea393b353c7a442b791d6c2259f7592dc129f3ddf3198f7896dad7dc5f5e3 SHA512 5e12308c218345aebfb66b6dbd8fde60617112a0194a743feeb8e437844de88893c1add6a6ab34ae86b291e679b14a931e9da59db274ab69d4ef02cbe2c6550a
EBUILD pbr-5.1.1.ebuild 3158 BLAKE2B fc0a90d48b599a09a6608fe273727068f21c13b7bc69a811a804b17d75fe7f6d185955e3f892b2415c1df8ec3d0941988b9575e4f39f62755c2fc034b3dd8d77 SHA512 5782d5e43c411507efd73de8db18088922f8c732e1a717b98991abf425c5f1ff2e10cfc7175fa72367cd4275a41c0f77df37817b4ebfad767b44ee2c144ba2fd
-EBUILD pbr-5.4.5.ebuild 2506 BLAKE2B 3beff550f3349560c83a865c9b7b8b392b5a6172cd3b31699d3e54d09ecc6128e32764015f75f0e2623f0ad16a75ff92440b3c0d67e0c99a93a5575d3c9667e5 SHA512 1feee555396315cdc6d0fa1089d1f05ba7951b9434968d4a610e935070f158157d45cd909511e4cc8dbad78e7ca050250baae9f36b067e61602441c42cd07987
+EBUILD pbr-5.4.5.ebuild 2497 BLAKE2B 1fdfe4a2af6eb1757f279127b6e02dc0bab35c32cbaf74b97145a4a15d15a057eda21ff65e4aff21d05e28d53cdf21e2a345a2c64273c28fbf7ac09601d1b6c0 SHA512 6c94faf041ac2cf9931753a3f2399ac27d52c939d2b151bdae36fb7a2724d2feb807d7e691a8634235fd700071873076a242498c9b22c0d97217e030f371e9df
MISC metadata.xml 818 BLAKE2B b3ed054273dccfd8cd24f2e86e1505be70445aa45d193d37c30e6f5abcfcab489d59cb6a1e11d54cea70bbbcd152d9a208dc32237058537b99061172f573b868 SHA512 3d21678a6769bea88b901391d5df75882798e49ab5266ab7d5a73282c30793e479ebbe24cbb5b7d35ad19b517996e52243d238632a390f136ff30f77f54436fe
diff --git a/dev-python/pbr/pbr-5.4.5.ebuild b/dev-python/pbr/pbr-5.4.5.ebuild
index 26c449ed139f..36454f258a7f 100644
--- a/dev-python/pbr/pbr-5.4.5.ebuild
+++ b/dev-python/pbr/pbr-5.4.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
diff --git a/dev-python/pebble/Manifest b/dev-python/pebble/Manifest
index 988114f959e5..2b6f27f6fe4f 100644
--- a/dev-python/pebble/Manifest
+++ b/dev-python/pebble/Manifest
@@ -1,5 +1,5 @@
DIST Pebble-4.5.2.tar.gz 23719 BLAKE2B 62db1c273ca0d27ecd16a7dc2508d288ff95ed7f0f123d58e345fcf1d48eb17fd829f963be53e63b377c765548769654d695322e7ee8c8a13369b0e74eba0eb8 SHA512 83391dc29c98615e1308dff9e4619471c7407c2981421b00e77155042d41f4a19c819c2ba32103929333d71621be47fa2eb5fd9f36ae7580379789b2c870e59b
DIST Pebble-4.5.3.tar.gz 23411 BLAKE2B 4e270b0de183074e151f3c7cf8754bd3535efce601c0dfdd5bffbe04a4308aa7db6e6414668471d3af6f1fb374230590d90e2503ba223c2e95b17a2a0d301310 SHA512 e3b17fa6b9ca959560d364e84091e7990921eb9a2aef854c391a5d0e46359b57e5ec1a4239ac97f4c0bb485d0475ad8338c3485c9fdeff7e446a989129738096
EBUILD pebble-4.5.2.ebuild 501 BLAKE2B ec552afb3ed8f214ece0f957a302e58e5b4fbccf7c826b1cb473b5710d6de4f487bcc135bba0c2994e717d22d4d018f6d4af577ae5833ba0b74fe803eb285021 SHA512 bd524b376f44790712d703c855641da169d74ea8ba3745d00c6e65e4d15bde02412923c5b6cf53af8b907d8b52a32f64d0a38af4a8752d0027e2f492d345993a
-EBUILD pebble-4.5.3.ebuild 507 BLAKE2B 418dcc35d202e93a4c25f5d0e4b94d723ba0b16e669b11df9b7c353ebcc87748ad8fb25d1eb3bf8b9a069d36e650ce57f25a734ba3eb68fea10bed4ee7b4d914 SHA512 404a5eaeee9487d4774d0e47736373f7a17516f21d01be0abc76367c280014e5ffab3d067c5f6f898512eb2ec40e617742aadcc18bed15c6c6012abc03de34cf
+EBUILD pebble-4.5.3.ebuild 506 BLAKE2B ef1901498e09f84cd2d9a5ee543928b5e7098351b4b57da1b1f5a6da4db3a7e0b239c4e43aedf741cdb20075a77ecaaf3acd2323c69dcac26da177f12f14b24f SHA512 fc415b2235c7de53399ef17fa31c02037565e803aeab43498d4e0bb62a398ae10b296dc2b0e212279a80e6b205ec8c4a42f554e70517cdf5179d4994053df85d
MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pebble/pebble-4.5.3.ebuild b/dev-python/pebble/pebble-4.5.3.ebuild
index 85f87286314e..d6591b01d295 100644
--- a/dev-python/pebble/pebble-4.5.3.ebuild
+++ b/dev-python/pebble/pebble-4.5.3.ebuild
@@ -17,6 +17,6 @@ S=${WORKDIR}/${P^}
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
distutils_enable_tests pytest
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 099c6a3290c6..f8c8a782f56b 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -2,5 +2,5 @@ AUX pexpect-4.8.0-sphinx-3.patch 761 BLAKE2B 609849b3587cd5eeada58ba5065111f3d5d
DIST pexpect-4.6.0.tar.gz 148966 BLAKE2B 0ed1a3c31133bf618e4c75ea099efaa9bda9e2b7f92f46c54ad553ecc56487e5415b750334376a95599ada53e17e91efe7d4b65ad80bb4f6a1cf9d655a3c9685 SHA512 9a2b1ef19d885e69cfd17ba0519581f782574019010043e66d8b68f98ac86b359f4a1ca42f8bb0059a5dfdd43275ad93531c076cc0ac2049e109408961b46bbd
DIST pexpect-4.8.0.tar.gz 157037 BLAKE2B 742642bd6b9ec3f6cdfad054d4fd22db56b4a55b746d675c27a8cdf824ea749ec4589e296dffa08778195f3ccd20feb56bc0fd5212984396ea5aa0555c41ca96 SHA512 7447ae2d1e13be422c894a8fd51c5aaa788e37ea7f0c798c88b77afd401fb3631400a637077ccbb83c2e3876b0d0c5e1dbd5fdc9d3739d785b4d5ad7c0192580
EBUILD pexpect-4.6.0.ebuild 1035 BLAKE2B 96382c648071656d317e9a12a6c75c2290d6753b9bb1166f2f1c3005b10ec13eed9dece1fdb4d67369aebb2d4441e27261d417750d93a668a527b1ab241e6c82 SHA512 cd2feb6f32b22c1125cd7c58e21b5ac3ddfe953d73eb0d3ca6dd98df768257c60afc2bc1519a5468137c2c44e58a50b444c9d13850273434304d163ee5cfbd33
-EBUILD pexpect-4.8.0.ebuild 1271 BLAKE2B 4affd57d4cb12cfd3a42d314ccaed5e39079e5e9d3077a6fb33e12da3c886d949cc635cea9fdbe12e375e28f59cb9f362ef5569dfceb7944e324d12773a7aaaf SHA512 cb61f5152a7aa163f4af3d7ff898048e0a9eaf967f11ccac5112ef5e7e40bd85f2d03db8054183231fc54becdcab4bb7b93d5217b70831eebe845ec62b73adbc
-MISC metadata.xml 377 BLAKE2B 72c4b35c12a770df9344987af8c7a392c3aed05296a4876902987ef946239f8318ee833cc81a7f004719e954670a83e84a3813bcdaac48912efad885515de1ea SHA512 31e65b2ce9ec12e9d3e95ed651841b8aad6a24330fe20b4bfd6351267423ff5005ac3cb2e89dbb8f024cf60705d3f06a8a1309169a029eb5246ddc45a8d76464
+EBUILD pexpect-4.8.0.ebuild 1269 BLAKE2B 1dae13183e9bf10c58ee459fc256d9b95d527fc82a2dec1fb958d85b2d1d577bc07fc270071d83f7be4470df29df53dda4533e390d92998273bbbcc59dc43b66 SHA512 7bea0723dea2f8dbf3a5f5f2396e605eb685ab1295b8f280a84e0ab6f7c01b0ca07b6a73be1b2374074cb4d519125e2ab56de222f319adba8548cde3a2ef5a11
+MISC metadata.xml 402 BLAKE2B e6c1f9d8cc5397177b54d7bda059a281267e005b9391e6d18e3b70ec3e6fd09bbdf1d214a105e608e3a43f34f0f6e5d7e924366e33647fdfc7d68283c8749d06 SHA512 bd48e666243651d02523b111ee7d8073ed10b8813765f19c7d17e12b7b84bf58be03a157486fcaa65f34866a983d46885723d944348a0cc16b9bb05cc474ffaa
diff --git a/dev-python/pexpect/metadata.xml b/dev-python/pexpect/metadata.xml
index 311134caccb6..67e271d5d377 100644
--- a/dev-python/pexpect/metadata.xml
+++ b/dev-python/pexpect/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
pexpect
pexpect/pexpect
diff --git a/dev-python/pexpect/pexpect-4.8.0.ebuild b/dev-python/pexpect/pexpect-4.8.0.ebuild
index ecae148b976a..43e69bcc1705 100644
--- a/dev-python/pexpect/pexpect-4.8.0.ebuild
+++ b/dev-python/pexpect/pexpect-4.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples"
RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index dae6a7b2994d..f25e2f0c02ac 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -3,5 +3,5 @@ DIST phonenumbers-8.12.2.tar.gz 2397674 BLAKE2B 8101aa4e42d53d9c4734f0e3e1085ba8
DIST phonenumbers-8.12.4.tar.gz 2269009 BLAKE2B 102630893595fa34f8e5bf3dc5122f43393e26ada216df02e843a40345aa40df83aa6fbf115d71e986a7e57e6a55bd6fd4eb4af14c4872bfe717cb0ec5be604c SHA512 5d93de2b7b6e974593659fb8909c05f2f6f8c29766deea914472b01dde38abdfc9f4f6ee8c718e2ad11e840070b350b623cb9ca58368f24cf1e03804712fa38d
EBUILD phonenumbers-8.10.22.ebuild 523 BLAKE2B 24eeb05726d2f9d849644b6af229762cf037129e27132d4dc364e47e6651ffb4520a41ff4b488ed2611a989fdf8dbdf3ad1261ea9e4d83f400edeea563b672fa SHA512 0411af8491522b28a005405181c384b8133bbe2c944600faa6c0d41f4652abda346635f30f3dbbe6b39f94eabb33abc686eaa3b2fb59c7b6c5e99e3bab8f865f
EBUILD phonenumbers-8.12.2.ebuild 524 BLAKE2B a9a7d4c6f0046715d87196a67d8bcebeb4f97235d084adb01f48bf5b2cd6d6d34046c2bfd351c891da4951f04b692598f9b70bd856d77f3a7490da8bfbf0b6f6 SHA512 c493ec11d4b19df796fa5b33d099ddec6ffdf4965d1cb8da4e203470d44c5070fd8ad46f3ec8771730a391f970d702e883397eabac5b36fca5ef54dddf98f91b
-EBUILD phonenumbers-8.12.4.ebuild 526 BLAKE2B d7f518932e132e6a6e0f2d6cf8aa4a8392b61c0ec46c23aabd64b389bb76a87692bb65da46c3cfe58d1dc2f2ce52b43ed83d485df7ce1a30dcb26d68ec578efb SHA512 b2c8842bb74f9ce6da75ea597f1df497de6b73002a089a17455954830339f04da5d23b0b415259354a7395004a154519d23f8957f5e7f7387a9a0de41237b954
-MISC metadata.xml 392 BLAKE2B 132a6d6143f7bdcca65dc93f90077577d9ea472aa6f2b107224f60a07c047e7e93a6fc9e9686e61d78299a0776487171e177c5fc3f6c85be74e29e1cd1132b22 SHA512 a610d3e2399621a5d222ae3de92108698785b077edc4bc969930fb60f6ba2364f6795538c6647fe46cf21c599ef00ecbab3458d45fb1d5f849e127c06f0b5634
+EBUILD phonenumbers-8.12.4.ebuild 524 BLAKE2B a9a7d4c6f0046715d87196a67d8bcebeb4f97235d084adb01f48bf5b2cd6d6d34046c2bfd351c891da4951f04b692598f9b70bd856d77f3a7490da8bfbf0b6f6 SHA512 c493ec11d4b19df796fa5b33d099ddec6ffdf4965d1cb8da4e203470d44c5070fd8ad46f3ec8771730a391f970d702e883397eabac5b36fca5ef54dddf98f91b
+MISC metadata.xml 416 BLAKE2B bd5cfbcf56e0e25ff836bfce4d83b4f7c36afb37bfa775ab29256c2ca33c6b0b626fd2aa43330aa4a9a900e972b5bb9898baffdb4ececa85d5e7fe3ac77421f7 SHA512 9e34103f6199b544e9ee7fac60e993c02816d0b484a0b8e5665f894c6a2f48622c11e899ac159a3687b4ffbc718eafb929d80c6fe936b2e5bdac300e77bfa294
diff --git a/dev-python/phonenumbers/metadata.xml b/dev-python/phonenumbers/metadata.xml
index 39e65b3ef9f0..9d3dfe58561c 100644
--- a/dev-python/phonenumbers/metadata.xml
+++ b/dev-python/phonenumbers/metadata.xml
@@ -5,6 +5,7 @@
cedk@gentoo.org
Cédric Krier
+
phonenumbers
daviddrysdale/python-phonenumbers
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.4.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.4.ebuild
index 3665d14f2c2a..ddeb720dd441 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.4.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index c7605268fc0b..e817583daf57 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -4,6 +4,6 @@ DIST pillow-7.1.2.tar.gz 38933761 BLAKE2B b1d8cedeb0e8108af3bc5de672bcf812cb2f5e
DIST pillow-7.2.0.tar.gz 39125407 BLAKE2B f49015922c34473590740c9fa63435f85f9a517b3295abd2e758941b95162cef0fb1fa2a0e6ee0ac86323709ee3af02888f6e029a1905f13698e82c1f38d5d94 SHA512 ac9c7c8f445b3f67f51bea13fad118d1612c45272c26d33bec286f3c2e198912b934378c4bf986b409aaa2a83d92ff176ee4d25f28701d61746c9cb86d0f412b
EBUILD pillow-6.2.2.ebuild 2648 BLAKE2B 759c37375cc6e360927e58a039a3d10f4b36e177553e05993cf685ec001015d956599c1a8fd6d94cce86522cfe0f8016b0fc7c9e35b90f42ab35d6c902a1609a SHA512 ad0aafc5257de131825fffe2aa8f18be67207ab7282f27a9b443f7db457e9a4f913fc5d4ee71f5ea141b96c5250e9479f85ec36de3f6cab0593935a1ce7ccf98
EBUILD pillow-7.0.0.ebuild 2638 BLAKE2B bc13ea32fd5b0a25aad6c976bc4776ebadddd6fd778126e0995391e684bab49aac9c8681face6a2ff9663203d820de77a9c18b895ab6ccf48862ad153cc01225 SHA512 a709259b589008d5e745b6011b10f503db7664fd9e52b858e3c45ef91e428b531bf461da9962a2807a5c0058980cbb7b70e0a22b84aa624ecf9690075c202ff0
-EBUILD pillow-7.1.2.ebuild 2692 BLAKE2B a2fca601f6c3129b6468c568bc51a87d955e70877debb831504f61bdda03881b59afb03dd3dd937e66a998c9fc3121833c768992158940b940c68db639a015e0 SHA512 514ce6bca4039665bfb2b01a4b9f5190151ed2971cfd60553b7d8926865e7b8d2c6e93d293ca917016f18a300a70aaab8c88937cae913292b2bbd103b46f8979
+EBUILD pillow-7.1.2.ebuild 2691 BLAKE2B 942d0ce65a6668f64fe150a0e45d41697a3b7cefab69c0accd2e431afd554a45d8aa79aab8c021af29b240ea6c48e075ddcbd06fddea43b54f63583d05727816 SHA512 b660e43ba44341ac0af2e99d2416348a1f85373a5f45b5bc4b87a99f83bb2029858c41e31236fedc56c601032bce1e9c62efb64f5b1b750c5bc818b89871a821
EBUILD pillow-7.2.0.ebuild 2695 BLAKE2B d2e93f51da0552a9fb7a2dcef8e218630ebea076b8185438f084bf77cf114293719306d9420d3f7ad6cbc0041cae19b69634350c8ea9b449aae0a1bfb7b89a60 SHA512 b4a06873c4c33143cc7f608b5ec8e3ee84f1dcb7571cff4631e2839b59ca19885fa036b0f6e72f54edc49130d64b1d2c402c2deca3935d78ab15b89c11bc4ae2
MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-7.1.2.ebuild b/dev-python/pillow/pillow-7.1.2.ebuild
index 473f42c783f0..06dd83d419de 100644
--- a/dev-python/pillow/pillow-7.1.2.ebuild
+++ b/dev-python/pillow/pillow-7.1.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
REQUIRED_USE="test? ( jpeg tiff )"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pipfile/Manifest b/dev-python/pipfile/Manifest
index 027a2e76f6d0..132957d8c14c 100644
--- a/dev-python/pipfile/Manifest
+++ b/dev-python/pipfile/Manifest
@@ -1,3 +1,3 @@
DIST pipfile-0.0.2.tar.gz 17395 BLAKE2B ac86dc6a725cfec0e3d23cd24ab9cdbaa5c803b15916e03e6d2a1e371eb137e25836e78b3393bf6ac42c6d98ebf85fd4ccf29f63b8ab9b87cdd4828b3499278e SHA512 070986a213d0d42c3f5391b303ee0c4a588269ad1889c79b6622c1a9817cfcec4365b8764dcd208aafd78394890d3367c7c9782e65dd3f04ea1bcce001f164f1
-EBUILD pipfile-0.0.2.ebuild 694 BLAKE2B 9fa5d451ba3fd6aa5d026faa63832f64c7232928a56a41c5143dbb132648ed12dce37f63f48b070c37ec68380cc09401864a7ab17b8576571f95984eaffd5cf8 SHA512 cc1913e0f4f2ee330b103835dce0db05ad7370ad4030917e00fab49d202e742d10cd424c1b41bc6d37627eb7003f25973c95a921dd1259c95a6bf8c7b967efe4
+EBUILD pipfile-0.0.2.ebuild 693 BLAKE2B aaa3c3dcbbb46af8e480b94af36058a80df16145147b3a547376a8b050b5df2b6b90c0325a30c8439144956f77901bd6ce553916e9a879ae2be00efbd0692c37 SHA512 6e08c03ecd9347ef488af721a9e53e1e8810cf3513c0b6b2b9c3d8657bf13c8e5cc944db4e65f128264e271249b6d146b2f0fbd6456da5b94c9b9887b25ae558
MISC metadata.xml 374 BLAKE2B 33a0b13410d7700b88daa529d089d32088b734da535af09b4b721017fad386338323207c58d94d517762f617d1d73a8e4bec44a5fcfb503ec8af83a65427e047 SHA512 7469685c63c03c2dd25a114bec9c2c3c8531858e45bc880f5cdc6066a9c22a7ca73d1be0d8ffbc5eabf3ca28ed80f17d18f4eaf86bb54ddd888a1fbcde53a49f
diff --git a/dev-python/pipfile/pipfile-0.0.2.ebuild b/dev-python/pipfile/pipfile-0.0.2.ebuild
index 3d58625f753a..55fa3040ed33 100644
--- a/dev-python/pipfile/pipfile-0.0.2.ebuild
+++ b/dev-python/pipfile/pipfile-0.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pypa/pipfile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0 BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
RDEPEND="dev-python/toml[${PYTHON_USEDEP}]"
BDEPEND="${RDEPEND}
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index 8bef808c452a..b365cdeb60ac 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,3 +1,3 @@
DIST pkgconfig-1.5.1.tar.gz 7000 BLAKE2B 5eec60ed5af17315513f676ba37b201f4ce897089a823a9bac89d281095848504f69fdb02637eefa2872cfc6e4d1150fc18d0185288c3418500a0e201be8fc59 SHA512 2d62ad1a51620d4ccbeedf621b563c42258d69cf3aeb63f2a29399a9e03f111be1728bdb0d9d924f916839cf9a3d7625bbdd1a7b6f2471a221e764180a56fa59
-EBUILD pkgconfig-1.5.1.ebuild 574 BLAKE2B 95abdfdd6016fae1174e5c3b8881e0d559460952d99e24131879a4d2458da7b521d70ffb13d4d1688bfdc7c02862379ba5d139d8a7fcd1b9a76c37c36652e5bb SHA512 342f8b131c0e4d0017c7253a864afcee2d3a1469ef922714ca942380596b167b1c8b74e0df00232c386df1c6546fb6e150e59b5237a5bb8cb87da083a8c894fe
+EBUILD pkgconfig-1.5.1.ebuild 573 BLAKE2B 455bec76ff7133dd0a8ffce24cc6eb93b8e6cbe75da239aa3b98b589d8aaabf4abb3640021d30282c62ec479c5f2ff0cf21a414b706da526e8a0078c2ae6f607 SHA512 f44e59cf73ad7b138bf6853819e1e0286136d473e140fb94a7630661cb37dd9522a7b4d123956a97172734f29b3007023c97f513730e4c176f2f941a5c3825a7
MISC metadata.xml 379 BLAKE2B 6d974351e99e999b08f6c18b48ecd4dcafb45452f724d6d038a2307a205ca00f300bf1c60761bc9e63726426f499c2622673dd677afb263c957fb398f264504f SHA512 2e92f2bbce0b0b8d9524ffdd2950c90ce34776d497c3d3ad47f239cfc562cbc7f52c3690b9df132f8466e386783b5287e63011c0bc8b1ab2ea839d1fc3fd9af4
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild
index 364f79d56b63..5d25d1637ed5 100644
--- a/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/matze/pkgconfig/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
RDEPEND="virtual/pkgconfig"
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 17baf11b8789..a8fa2831b150 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,5 +1,5 @@
DIST prometheus_client-0.7.1.tar.gz 62880 BLAKE2B 8878a6e6a20f96443f1f14ffbb74eda7dc6f1f48151901da047ade6342ddd7858b4dcd808d80af64a3eff449c1c7425f9eb9f3d1283b65e8e6067c6b5fe2f9c4 SHA512 84b145ed191c9903d390b152c72de4f2afcb4c500b8debba59ded081f00cc76109b336ed2d7783d59e9922ea2927632f7ef730f336974294b20048c51e9d58a4
DIST prometheus_client-0.8.0.tar.gz 67749 BLAKE2B 570c95de0d4e9e8bd625d55eb3dd450cf933ab7c8b6af74ff56414045f4d845c4a74f60d60e8b29f868801de12ebe2d39b5ac11701071c4998aec66719581b3f SHA512 a9d49bc4dac77168f94edf51344042bc5210b07ed01031dc50e323f86ea8292df7370956a4fbd9d9f85a0857a8ec9abaef30c0c2cd4dc5502df7264816eecc8f
EBUILD prometheus_client-0.7.1-r1.ebuild 586 BLAKE2B a2a898d7983cc0018093183c90d6d250c9367a2c813b6519655174e19466de00286da1e515b663e935dea29d76ec0fe3db5cff5c4bfcc6efff27e5cfc608855b SHA512 e6401c2e0d5b988bab586e76af007ebc101dec0fcad76cd0a90b4d104beda97005ae0e17e71a7009e059677232cc68bd105ea607198ab9f1ba82ebeecc093a16
-EBUILD prometheus_client-0.8.0.ebuild 599 BLAKE2B f5a6f288ec77ead44ff5943e439ea33e7b680a4b255ed9c9637b8c00ca367bae521dd8ef292c3d33bf05bc39fe1f1352f36ac9f3d75a64a5051cf14e5173d8aa SHA512 9e431d87b41a9866a9be4a54b0def909cf71542ec9d197fae8340efe2cfde82e343361a17794ec984eaa254a9f3e2ad456be0f5e7d88db8624ec507db40fdd6e
+EBUILD prometheus_client-0.8.0.ebuild 598 BLAKE2B b0a1509b4140c905ba4379d5088ffea9cb8d03328a67a45ac1cae425dedae96ed2fabc7a59cc8617794cef0dd64e6e21618d3b9fa288571812cd58e404f7360e SHA512 a454fe942e8e86c21e42039b5d7a83b140bfc0e368cfac559dfecd2585af3e65bfdbb336e6407d376303cf524f2d217fefedb48485b1f6d96c5c22b2fe22d2b5
MISC metadata.xml 339 BLAKE2B 19175465b43ef0c7b56a6241f5e857392bbffcdd12de70833ca0c7c0fb2815dfdf529553721cab2afda053a63caad1621c06508dd1f776511adf5be84cfd010a SHA512 887ce6ef1c7181d5c87e69085c6d58c324260aa7dede8259115131b367b2d60219537fe8b3366ce10ec8904c15fb36626e34e28e6dde2db120c8e20f80fc9d74
diff --git a/dev-python/prometheus_client/prometheus_client-0.8.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.8.0.ebuild
index 173bdca64c55..885318c18924 100644
--- a/dev-python/prometheus_client/prometheus_client-0.8.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.8.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/client_python-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
diff --git a/dev-python/py-ubjson/Manifest b/dev-python/py-ubjson/Manifest
index 1f120b3dd067..04b83569a52c 100644
--- a/dev-python/py-ubjson/Manifest
+++ b/dev-python/py-ubjson/Manifest
@@ -1,5 +1,5 @@
DIST py-ubjson-0.15.0.tar.gz 50111 BLAKE2B e4f248935778f7d0802b5bace155409e47609b18fa21792a8eb16ef24e3ee2eb59d143b039994b4342bb47c20da4539f4d83307f4afb4aeced5c238ea6c7f7cb SHA512 daeb50dfdccf1479a62ad653aaa37cdb0784ff22397e466f7a9af42a1af3165ddd11308b0d8917b96d8a8d4b87040d0789b28223838df826e953acb2e59d3a1c
DIST py-ubjson-0.16.1.tar.gz 50316 BLAKE2B 442894a7c010d1ba4a836827ca17e7cb10b34a6f5488851ce13a3c3ab02d8173250a664da4504bca9fd2d9377631e249127c789a4824930f8b35db2225902e9d SHA512 5c5e48fa236571832fbcd100ebe0efd7522a8f5773b74475e7b102fadc4e2917549640d12c5afb2aadbe65a6973b75540681da1df8febbf47f84844bc9337fb0
EBUILD py-ubjson-0.15.0.ebuild 581 BLAKE2B 64437df28e91f93b9de8920cbcb6207fdbc7c9574bd896d5370df2d0d5d92baa1fd39a5ba838939f1dfed7d39e197f601a6c414265703f19cddcc7218363078f SHA512 eb03912e1fce1026ec67750e8d089dc424ff3fe0ef5ec97ff537692588d963b8406a903eb2ce2811266988211434bd2e2bd157cd5f022404ee05100e70763c5a
-EBUILD py-ubjson-0.16.1.ebuild 584 BLAKE2B 2d3e5a8bcda7d6e14b1de75d22c22c38c70e407dbd70893757f7d885194c0da40f9b9a383bca5af2478a3cd4e9ce9f63cc051fd3b4c20f4e7be9580e30148fac SHA512 2ad06c5b56aae40f3e51718905f0a9ed7e5d213891e3606720c70b6d0f4e39128ad3218c08ff25416b4730834148ee2daea505149db3c2e1e1af1ce07f9b23e2
+EBUILD py-ubjson-0.16.1.ebuild 581 BLAKE2B 64437df28e91f93b9de8920cbcb6207fdbc7c9574bd896d5370df2d0d5d92baa1fd39a5ba838939f1dfed7d39e197f601a6c414265703f19cddcc7218363078f SHA512 eb03912e1fce1026ec67750e8d089dc424ff3fe0ef5ec97ff537692588d963b8406a903eb2ce2811266988211434bd2e2bd157cd5f022404ee05100e70763c5a
MISC metadata.xml 634 BLAKE2B f799cc627077029b5b5b1009539b5d55a15e581348a3f8a6a93f2661c2e40b15772920d0937d56e620625bfe61902135c228efd18ea93d4538d8cc2f0ee73375 SHA512 900769da6ff1965cd50824ca97dd27baaa5d816f0fdd99851b4063c8dfdf3d469b6a17d4372bc6d16d34245609e76a5e2223b5bf61cb467f8cfabdf775b6da7f
diff --git a/dev-python/py-ubjson/py-ubjson-0.16.1.ebuild b/dev-python/py-ubjson/py-ubjson-0.16.1.ebuild
index 5afc56e7348d..12d10808c3c0 100644
--- a/dev-python/py-ubjson/py-ubjson-0.16.1.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.16.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
distutils_enable_tests unittest
diff --git a/dev-python/pyaes/Manifest b/dev-python/pyaes/Manifest
index 065c9a5674c5..76228d471681 100644
--- a/dev-python/pyaes/Manifest
+++ b/dev-python/pyaes/Manifest
@@ -1,4 +1,4 @@
DIST pyaes-1.6.1.tar.gz 28536 BLAKE2B fa7ca95ae181cd48e21ceaeab42f937c54bc9b90b1a337aaffd6317c8091f813b1fbd2abbc14a600a747829a0e94ac6bdd5624010a27f1c342bfef2390d7c8fb SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a
EBUILD pyaes-1.6.1-r1.ebuild 634 BLAKE2B 8acd0c9f3006ef236c9a6fd919613977d3df457bd578f42c2661e5054bb6218892c64af8d505803a7ac336fae223d0ed0dd5ad298123fac2dbea5b51ce4093c9 SHA512 87ab6faefb09b458a3b7ee21452e2f99132dff66f56ee0d3347df35bafb7c8ab410559fb739c1adebc62ca654f202cbf1525dfe3b594885aed5b862766e4d836
-EBUILD pyaes-1.6.1-r2.ebuild 754 BLAKE2B dcf54c8a4858fccf507e13e92890058f16969f9cf06bc95308ded9d44f23348c17823cf8035ed8687912492ae5f2cb61b9915de954af8d5823701692750820b0 SHA512 2edf0733723c2f88ae01989f17b57de1c2cd46bf0b2e03509fe2cf3c79b86b867b5cf4743d3bb1844713af97b9206d53574838061bfce0ea252250793d06dde1
-MISC metadata.xml 413 BLAKE2B 8f8dd44dbba6ea7f5428112866c3dcec032237c42001522d4e520d2565d378cd9e6e48dfb9eb1205f78b5e85c4f9964c44075774807d35188eeac72cd1e67fc0 SHA512 63a02ec94c96d1183a71a1a4676d54c3aa915666a0080edb472e169769669ca5268706189613a370b754c66df8879742e0705bd378c7ba9aeb9bfc0015e7a2c8
+EBUILD pyaes-1.6.1-r2.ebuild 752 BLAKE2B 3cf3b56354e542d21854dad92588e7295cc606fd91bbf07912758ae50cab1a503b33c4f089d9cb93a307fec4d74328d70ab510e08ab9fd8634cab05e348602f2 SHA512 0ad8130494dfba0f7f775ceac50d3ba66dbe4b8708acfc97695e0a725bede10a7f94de4f64ed98a11df1b399879444b860357e2a5a87f8e9888e3ef3e0ceb271
+MISC metadata.xml 438 BLAKE2B a9ef6e6bcd23ddb73d9a005c520caefb142d8351905f31875100ccc005a77738038aba97a4ca5eec19ca2986a9c52820e40be958053952bbfff174e01f57d846 SHA512 0d1bf03984e248499483ef6248f11baae42b253f231eeaca17077129fe9ca38af69e2d53c7b438c63217d9f5f1ca1f58a18fb1b15c7d161ebc94917fc90e8a5d
diff --git a/dev-python/pyaes/metadata.xml b/dev-python/pyaes/metadata.xml
index 0da1301d49a1..c3e1100bcd68 100644
--- a/dev-python/pyaes/metadata.xml
+++ b/dev-python/pyaes/metadata.xml
@@ -8,6 +8,7 @@
python@gentoo.org
+
pyaes
diff --git a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
index 0e64197b7170..021babfae925 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index 21dedf3146f0..2945c7d66c88 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -1,5 +1,5 @@
DIST pyasn1-modules-0.2.1.tar.gz 65808 BLAKE2B 7c1490926078682dd4392bd6c6dd73f944f55e8b5623fde07a3bbc1f62dcfdd1ea8b5217232cd7e2709997424fd61e276cd5786ba618cebd11cbf8ddb695dc53 SHA512 2d8b6bee59434fee41747625236c1d7eb5081a1cef66aa0a0e9e75869c3641a418d21544edafe65f1808ad0dacd9cf1047dd036ff5ce668bb3bf1f6e662e4a5e
DIST pyasn1-modules-0.2.8.tar.gz 242864 BLAKE2B 22b6cc27d45d19d8e7f5b12c8aeff1fa379bd567fda6b1dc0fafd00c0f4367d32f21cd48cf3cba140f2f11ba7d258140e8014c8420300451ab1acff475d28da7 SHA512 fdfcaa065deffdd732deaa1fa30dec2fc4a90ffe15bd12de40636ce0212f447611096d2f4e652ed786b5c47544439e6a93721fabe121f3320f13965692a1ca5b
EBUILD pyasn1-modules-0.2.1.ebuild 818 BLAKE2B 8af7817a881c79f9126e3ea0c03e90d864999474ea747b853d3c35d0d3575506206d90330831e36c1f6771fdd15947056844704f224589dc9f1d5d036379d341 SHA512 0a2db7b9db522249b36c2b9e22dd50d450a73e731d62c3679cb69392991870a6b4dae8ff2f018ee2aeaf11fe768a08eb2148bf71ec5ca8e9b262bd86eb69f5f8
-EBUILD pyasn1-modules-0.2.8.ebuild 786 BLAKE2B 1598c534e74a0067502d2a8420120c82480edaa12123a31cf904f1a53b376d48f4643450ffd1f162829e0757b0ab31efb12d4ba8d50a868737040dfd266826b8 SHA512 9fbe15423db7135d46c22cdd6004f8a0e24fc37630bf5203368a07239464cc0055fea58ec18a9df54a816e60b42aa27b0df10bbcfd227b4e33e2dbb296e5f1e7
+EBUILD pyasn1-modules-0.2.8.ebuild 777 BLAKE2B 664a6c0aa856cf5795ee6af36dc2b4167b3bd7edaa6cf8b500a3f2f7b18b0dbfd205ac0d6305d110ed5b652ed1112b2a377dc15b925198f6991be3ce45622453 SHA512 470a607a82c5bd105470c9568eefdfff71ec9f73b6d0760b6c22854daaec9188c00447976ac02cced7bded32ade6f91a72b46e562d2bf9fb5cb7dead45d113ab
MISC metadata.xml 405 BLAKE2B add7a93411177af899c2635b8222655804111e50ebbd82de341a19478a2ebbf8087efa7e473732d131af3db70fefc0d8d495eeb98cb927961156d65c0b8ff06d SHA512 fd42b04e0186119d96caeb401efb0d8810c837bf50a349d1a0ad9a38323c4b42226a5e9202ed4530823343c877895214e6eb92f9760c7599b2a6843a79261246
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8.ebuild
index bb803bdb113d..c50ac1108988 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 9f54a6a6301d..6d3cdaaad594 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,5 +1,5 @@
DIST pybind11-2.4.3.tar.gz 138789 BLAKE2B 6279ddbc4ca4c8a62eeff684cac789a315eef0ce769258c8152f7073f8bbea39e582ed1ea86fae6878f46c675ed998c314bbaa54a40457287833cc555f5d9692 SHA512 97b6ffb38dbda8021e8265c2052df65785d532dbcd94a2b711306f806eab1a9e2aaf31ea466f13eb5784856ac69e0f4c1dc6d742aa70e5a10ce9ce338e5e9d84
DIST pybind11-2.5.0.tar.gz 573769 BLAKE2B e46d99f873f8266efc577d3e0ab1e8a78784a45c35995bc3486501d627698e0fb10205008e8cb82c84e971f20cd02a6d2f08390f3a3041fff1a21c45f11b197f SHA512 7f3a9c71916749436898d1844ef6b112baf0817a386308b5df8dec2a912ef4b6a932b94965e98f227c49fa77312f131972a6039f23b84a3daf6442a8ab0be7c2
EBUILD pybind11-2.4.3.ebuild 478 BLAKE2B 67d1ceb0003ce620d43f0a33800d5b9718a1a48d00eec456e88b63134df36dca5ab246e08efeb8ee1991f30dd3a6ff0c12a4f35fd156cf92326954448ad83c22 SHA512 4f8965e2cd685936d76ec5e131af307a919e72ba1e8d845993b3c5c6d1f203927bc2127a389658715d88fb208f5b3f5ddc7b574272cbf0e3130e3a80e1930e7e
-EBUILD pybind11-2.5.0.ebuild 1305 BLAKE2B 65b14a85077c4c3254f497380a59ee8fa3ecc2e995f214d3aa57754e68d7f67ddfcf94f2be5df6638504bd81d71257acb719346dede21c63c0da846ec4f00a33 SHA512 a1514c9d8f8b3d041cae951ef8acf8e1c3c9c35ffedf071ca8a04d63a64a7fde2e94ee5215e18f618b6539cbbf225309a4623e75bd255eb8c04cfc1b7dbd9fb2
+EBUILD pybind11-2.5.0.ebuild 1304 BLAKE2B e912a5afe8db71bada4eb60c0a0f675635a3832b2b97f3616faabc31cfa4443ec3dfc83757fc9b84d00c1debaf5eb1f0fdd8e5297e93c9fd3570ac416ad59702 SHA512 fc762c17d92409229729154ee5eb32c19160a79310f148c469387f9961902192fe92902258ed192cc6076c300c7a5832eb74720d2b8a08b8f9316b5482c4d366
MISC metadata.xml 348 BLAKE2B 06ae224547d14422e51d6e07615adf51fee22afcde2391a4483a8e1937b932a4268f0b31b94d4df12bb06804101b0e6b51614f0ffcb601a4fa34616dcc939377 SHA512 02a7f6afd867bf9f7832a9c8b2d1470be6b1fd537ae8f9509143bb6acb3af75c1eefa38b330bad6aa5e2c37a1158b4b0260277c6307a9b97d144d6c3695a855b
diff --git a/dev-python/pybind11/pybind11-2.5.0.ebuild b/dev-python/pybind11/pybind11-2.5.0.ebuild
index 338584b79ec7..51f9f333c836 100644
--- a/dev-python/pybind11/pybind11-2.5.0.ebuild
+++ b/dev-python/pybind11/pybind11-2.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
RDEPEND="
dev-cpp/eigen:3
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index e2ba5db8f984..369f1d254b96 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -2,5 +2,5 @@ AUX pycairo-1.19.1-py39.patch 890 BLAKE2B 8ee84005e17fd485f568213e751dd30bcb9048
DIST pycairo-1.18.2.tar.gz 200462 BLAKE2B 1f755dc90fe3ee50aa68273a0816752312f144831ff857709e1a4695a58646ffe6be518733480ed37231c213a11d4e5aaf8dfd1cfa68104873bc7d4192435b89 SHA512 279ea80413ba55d493d51455685da09afa1f5c45e2930c3fca3e417a8afe6645a0d8131201f79482de59e5ec56cfef62eac65ed88fe88866bfcc06503dcc59e0
DIST pycairo-1.19.1.tar.gz 205196 BLAKE2B 504334628daf75dd9145c97fbd86ea133b4be225ce7fa911b48231ebd5434678ffa7b1f185e0527f96b4b36955e788d0bb4fa4d308843e5ae9b20a41d2126301 SHA512 a7955a2566d5e5586154b62f3aeef824e1e6076cbd3eb86af8288fedcc7d61c4e36a53691298cf9df2e2df7fc96292f96dec92c5d4343e6c1b4c971e97d0650f
EBUILD pycairo-1.18.2.ebuild 1170 BLAKE2B 417a4ef2d7d9d89b9c39931007a9b41eebe49f1184f967c536d2816847c521523659ceaf02865b0093b02c09109586213e9fd8ef21fc234f291c6fff51ca895b SHA512 e9aa24118efe4d0d8b456e7c8a7bff9cf7408a23bff1559f2c44f463ad97ceecfed5c39af90397ebbaed5de430f8fab3cec02d9d06319960349068cc38001840
-EBUILD pycairo-1.19.1.ebuild 1167 BLAKE2B ec7f7443d44d189c15c8bac9cb19c3e74fcd6ac765833734078a1050ebb14774179b60a5dd92b326ea74fff6626c062fb7afe076dd0b0fb36112ab6e34fc149e SHA512 41f22e0c13532bf8ee42c62efedc29ef3a6dbe1f71c3149a32fdb37012a385e72a9632a4fac6e2d16935ad3bc9fdec346148c8776360c4d460cd654983a5efc6
+EBUILD pycairo-1.19.1.ebuild 1161 BLAKE2B ba66bf658f9e820e4214de24a1c8c5c156979c9dc275e15a2425a257c775ab228dec1450bd9cd1270f63ca55665b1756c7e731f2db7a9639908e00f79f0f6099 SHA512 aa9ab122e330daaa20329aa991b213f307102d4d8e4f4cbc429cc6319a388b167f05b4f31cbee19ee525ebe7ef1eb014339665adb231fd94f0fb6abed644dca5
MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.19.1.ebuild b/dev-python/pycairo/pycairo-1.19.1.ebuild
index b05ecffc14d0..0c2cd3260144 100644
--- a/dev-python/pycairo/pycairo-1.19.1.ebuild
+++ b/dev-python/pycairo/pycairo-1.19.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="examples"
BDEPEND="
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 2fb0a0cbaafa..9e828cc272e2 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,5 +1,5 @@
DIST pycodestyle-2.5.0.tar.gz 98802 BLAKE2B ec86642f0f37abc4da8886df6395694b54cbe4e1d0030615b2136f0bc265825df254f019483e9094feaad685e43008cefdf0e50b533df434a40de0de11aa5fa1 SHA512 84e751a7d00048393b02ca743de5d71d1641e948ee1b4daebbdf2d07e0cd8f087ca4e81f826061114b40ef41920bbcd680c9f479e7cc1a159a70188425717208
DIST pycodestyle-2.6.0.tar.gz 100213 BLAKE2B 484cad34de86ae50f8efaffe590e79fa52ca7f13a3a9d5c9d52f52aef7a940a9eee8cff74b3bd1f711c3a01155f0ce6794196817d1b0e941b8afc77de4804387 SHA512 3bf9904752170135ca399a1b25470a531adb5b85dfd8df7ffbbc86b5875bc3a507cd8732158bc9cb7fd5b44b48c9a32d63d621856d55a15bc3104a99ca4bd271
EBUILD pycodestyle-2.5.0-r1.ebuild 1130 BLAKE2B 130e4b41354b1a24331e91b9406a47752a3c8466973bc90cec38973fee2e235f41d7f9abc86907b723898a72b5676709f1bb204bc6da845f0ce78fb508f21560 SHA512 df471dddd80d5b9a4f63f0e5a0c29167be7956f51448b73d0f88946c690315c0757d09b5ef6c684a366444723a94be9dbd9d66eced6e1ad079a492a5d8a71be4
-EBUILD pycodestyle-2.6.0.ebuild 917 BLAKE2B 1ac03da246e02b994e95d30c7dbe5587f946a30cb58df71ead85edd15418e0d7db5e1fa81b553419698216d73522fa32b54166b21a301d2971c6372d537d248c SHA512 140bee85417c6a1fa0a5eaf524cfffdf717792e45b79364da3b4f39d1ad481e3ff93ef6937d4d43f0aafe9c69c013aad0728989db8c680425d7d02b25ba96b98
-MISC metadata.xml 335 BLAKE2B 9ecbe193a8f7aaf12005920847cd3d8a34b868636a943ba30465a4eead591ce46d422bd0b0e777a86f0d5c4efd5ed925a1476f18f659f18e622dfab057df0d8e SHA512 92e19ab42f44fe1a1da2c8407214bb447262a818b2051e644851178cc7f2274198310a85d7c094839b1764664bd8f8463a6a7a96df83447768082c8ab44909c4
+EBUILD pycodestyle-2.6.0.ebuild 908 BLAKE2B b576b89f64d10a9ccd97da866076b13c45cae967160fba572812d9b7fa88a53a5d68551828da56415fe9afe3b0a6c7c5bb4caac33dc66b9b668d358e12964ec7 SHA512 1f8db0996c51ef2df5f24b708bdfd7628c7ef73d3b8c135cbbc1933cd69a4d390320c08234759a14b9d4eb837916951f99689372f3fb77099cb223e6b7d736b2
+MISC metadata.xml 360 BLAKE2B f3f8ecb3bc2ed8eab2e2283967a5a7a94a5149302e8651e819204810bfc7fe43689f0b1c35824a737fbffbd5967845ca089a539dcd0b50704b6d5a219e3406a6 SHA512 2364901eb99136d33c8343c14fdd7d0f83e6328c311a5a8395068724a2d15d8dc6c6ade8026336ee92cf105e589d7fc960780f70c938f67f48c797503a956e5a
diff --git a/dev-python/pycodestyle/metadata.xml b/dev-python/pycodestyle/metadata.xml
index 9771dbcade91..27bc28dc8541 100644
--- a/dev-python/pycodestyle/metadata.xml
+++ b/dev-python/pycodestyle/metadata.xml
@@ -5,6 +5,7 @@
klausman@gentoo.org
Tobias Klausmann
+
pycodestyle
diff --git a/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
index 686651f93a4a..6c0936b68e1a 100644
--- a/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
distutils_enable_tests setup.py
distutils_enable_sphinx docs
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 233c6907b2e9..e06e87a5a5bf 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -3,5 +3,5 @@ AUX pycurl-7.43.0.5-telnet-test.patch 1561 BLAKE2B 640203da8a9b6a13cb5fce187c669
DIST pycurl-7.43.0.3.tar.gz 215003 BLAKE2B 2f1e61bd52873906a2d0480ab316c9026f2722cde14c059884ee552a2340fe6b646b4021326f72730aa9eed82f57b5ba923d19c2b8dfadb7a8f8819982116e7a SHA512 eec5c5f10b9a78bcf7e786368cdd5dc165faa4bb646df39ad52c1dfe8110e3e56456f5961f63ab7b460e51e56c41e66a0fc4652c8132411f1dee4074b3cffc00
DIST pycurl-7.43.0.5.tar.gz 216877 BLAKE2B 57605fa3426a76e0cdcc1bb4f247985a27439d67d32769945332f94c49eead7fadb2847accf98f0d0994e461fc9d6fd100a181ff6d3ac0765dad31d546a75ff4 SHA512 835ed6cca25d2dd3e7084f905f3b0b082d4af04761fa9d4dc4714865863a97c095c08e6f55ada91b9f60ccad7838328a82fb2add8108aea12056200cf1f12845
EBUILD pycurl-7.43.0.3.ebuild 2671 BLAKE2B fd73be6647ac15afe8e6770c6cdd47d835b2efce1abc02895aebe2a29c70d6791589557056f493d79510d2c531e745521fef7ab69f552008110646232eb7ccaf SHA512 7b51cee2882727f5a4dd9e15f1e14f598d9c00be43b5b2d567cf9d556137ffcbbc1a8ee5efa6d4311983a906fb41e2c043a5f01dcb50c050c2ea3a6c56988bc3
-EBUILD pycurl-7.43.0.5.ebuild 3015 BLAKE2B 1b91aa49892fd436cb987142b2c2b0e6863dc37ccb24645fddebf82624fde2684b6d77e19ddfc18c462dfb59eefef6d6b7c18e5da272d51e8b37a181d38ee0a5 SHA512 35e2dffbee4283fc095dcde9f846e2925564facde8ea8b0f8b740543ba46efae72d4e7d84dc90f6e5891e0516f80a6d910e7e6f4a69c8ab57cdfdefda2c628a4
+EBUILD pycurl-7.43.0.5.ebuild 3013 BLAKE2B 9b48b309f623c39b7b47888c4dd71b56e7a0c8816270645bcdce42355e26e759eee926d83eda538281aeb59290c8d10e5eb6bba2d31171a783845b8402b56c38 SHA512 6c21842a6e5a54f81bf487e6cb6a5f8a7fb371e4cd3e9a0503b8fc4f060e0c330682690c519a44dba2404064bd900adb1900f9ba5232b77ec4e306bf426eecad
MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c
diff --git a/dev-python/pycurl/pycurl-7.43.0.5.ebuild b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
index fdde031769b6..503e143120cc 100644
--- a/dev-python/pycurl/pycurl-7.43.0.5.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index f4affdc3013e..78d84e70c29d 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,5 +1,5 @@
DIST pyelftools-0.25.tar.gz 499493 BLAKE2B 941b21526d1225a4effa25d8f0245b326d5ec652cea6741240613c19af61e03a537fe363dd4c10a90760a7ddc6201e20dd83b6825ad185ae21696be6f4d1e52f SHA512 06ead53ada32676161193d7e5cdb3b9e4c1910dcb34f77a544f53445651f8118b582716bf8c5cc54efb21b1ddbbcdb4b41c533350af3c41553d103c7fc74702f
DIST pyelftools-0.26.tar.gz 792390 BLAKE2B 523e6f64205273e8362db92900aebdc05849c5a55d48f75aeae4aa0c58d6dde35ba73c660a5993b211b210fba634360befbdfa90077a140d708c71091918e306 SHA512 dd166f56654592f6a0d7a91bc41c01b9300de6d2f08b204a61ac48eb3f4b3224f89271c5fe66adc41d71a5e2bed8ddfa4ad495098df917623f7aa90c2caffeca
EBUILD pyelftools-0.25.ebuild 866 BLAKE2B 6a9de0acfe09bf1c83d524856e43c4362d432d5158cd6d5f4db9e0f4b59698a50f65e202d025a97039f3ad6b3652f388403fe2e1707fe8d486265c028cbfac2c SHA512 0562a0927f8a04a85f35211ae3ac9c4f4b15c533a9d08e4d116ae19f2a159539d000e9b81d0bb606d6a89c0c0712f0dd79c14ddd97438b1c69b3a671e0cfa1ec
-EBUILD pyelftools-0.26.ebuild 944 BLAKE2B 248199e2b02ae0dd058d2069a54c218cd8386e1235cefb17091e22cf63700b1f7db320296122ab2c045c40255f6ea9d4b7c79fa91e7ea0dbaa2109f0c2b6b53d SHA512 aa315734b9de7cdce36aaa90addc0262e952e3ca269295a7fee7d0b1d617bb301067968d04f918b6b932b76c10f29a2b5687de337398dc5d6ef93f2e3fbee082
+EBUILD pyelftools-0.26.ebuild 935 BLAKE2B b81988c3108d6522e4537c9da2e5d952e6ee2895ea1c10518da45c86aaf398a34146495adac696ca72f1b0ff9930d17bcf0c932454750f547df3916e22e18a15 SHA512 91c387234c22803395dfe2005473c2220c334dabf6a138bddd89a512c35e98daa6b7d5e1b9e389eb1486aff92ac075bfb584de5fe7d875c6676f0ed646cb295d
MISC metadata.xml 394 BLAKE2B c89bcd4af21dcb7e2136ac81fdd480baa7749aee4ec4760a95192daed4b1db944e30ad84338a147cfbf56e36b7b8bcb3d7130c3261b7a34a24c6b1ef7539a9cd SHA512 7a09765be5f629bffc63e9a0ce39b84d3671a10d6a5223bc0f4d96ec3305579e7f872c708e744bc90e5d6a43d9c6a948fc4f66da3398b1c160325829ff714e6b
diff --git a/dev-python/pyelftools/pyelftools-0.26.ebuild b/dev-python/pyelftools/pyelftools-0.26.ebuild
index ba7b7d895acf..9a5e25ae8155 100644
--- a/dev-python/pyelftools/pyelftools-0.26.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.26.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/eliben/pyelftools/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples"
python_test() {
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index 8aee2367e33a..8cd04bb7a04f 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -3,5 +3,5 @@ DIST pyenchant-3.0.1.gh.tar.gz 75730 BLAKE2B 499638a238fa00510c9fcd3bc3d91c6486a
DIST pyenchant-3.1.0.gh.tar.gz 75012 BLAKE2B dde78c4f8e986be7e7b4f82979bc446d68a88c3289d472948bb704120fb0dfc3064b8fd46b1883724b0084eefb9e52dfd522bcda290ed5e7a99ae62c948f828c SHA512 d2bf872c15fca1e2c1aa8de06a9ee2c0e6128a69f728383ae9b91fb0ead2d66f804388671cc8156716e240548c29da41eb6c0678dd889012009c690bd078a7de
EBUILD pyenchant-2.0.0.ebuild 928 BLAKE2B f717a3d03275b4bf1ca21da816bf36e2361c57dd2ce4e8f5d643151ff14c46a72a1ebc08e9727b27d585dbcc57896b31579cf7b8bb4b1913970ec0d20cf663bb SHA512 fac06375830e23c7066a18926ef9218fcada08014a4f5b55ac2853c3540ebc98791132db9cc68049bcb503804f0e9816c689aaaff890d09e2dbf770c7e17374d
EBUILD pyenchant-3.0.1-r1.ebuild 619 BLAKE2B 7e1dcc4f68806f428e5aa93efd61f68fbc45a372524c820148751ca2701634e509068adfa8bbec70778cf14c6549e72ad62ba13afa988d186308424a614bd67e SHA512 dc3d9ef9d67b4ee82eaa00be5d4db5cc9f84f399a0db8faf379c7a1e377eda8d060b97b88ef2deb04abf6384c7c5c5b379cad683610df0bd06b417f9ed378200
-EBUILD pyenchant-3.1.0.ebuild 618 BLAKE2B ce211a41b53a873ad0a33b963116aa09c9bd8b6ec8a2cf630005d0deedcd8d6ebdb796f4606fd51be05b951485d3dfa6face6b8d02546a6f6f84759d32dd2f18 SHA512 0453edd22dbd75912a79318b742aad166ab9af039dfa80e7a86f9a208617d5a375df01cb0d2b96b0428e2b906213621a840125afd1b11e7daa6e795e352b22b3
+EBUILD pyenchant-3.1.0.ebuild 616 BLAKE2B 37dd8dea00bec46c1594a869e87701437c5ec734b4cb34b86016fe8336cd34172d3e0802d7f84bec001746503c7fca9cf52b45631e5573bd7d6fd8907c3614d1 SHA512 542129f0351df80cec95bf821b3e2e8554b1fe9dddaa28ccfb46d0d931304348f97a3c05759990883d43e3fbb34d8ce7bfc2f0f9e90c9128735b404b72d66677
MISC metadata.xml 870 BLAKE2B 991969a849f8342f8fcde0b547b58163214703c68ee65864522f6a64d74d8f8a5058619bb9cf00f61533e4cc218da2e3cc217049072b1cd2396cc7fa3ef298e9 SHA512 bf35258041e5664b6cea0a0c697edd684ee32c5a72f3dba7ef4bd87d060f58790d60a120c80dfbe4376cebd8edd9d45b5c2cb6b0fc5562334d8345b398cb565b
diff --git a/dev-python/pyenchant/pyenchant-3.1.0.ebuild b/dev-python/pyenchant/pyenchant-3.1.0.ebuild
index ec2269fe01ab..0c411b9ffbbd 100644
--- a/dev-python/pyenchant/pyenchant-3.1.0.ebuild
+++ b/dev-python/pyenchant/pyenchant-3.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86"
RDEPEND="app-text/enchant:*"
BDEPEND="
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index f09cae341a8e..0fc847e3fe59 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -2,6 +2,6 @@ DIST pyfakefs-3.7.1.tar.gz 179420 BLAKE2B 46f902527c2c69af1d7d5e296a25d5415b4fba
DIST pyfakefs-3.7.2.tar.gz 180195 BLAKE2B f1e76b652fc67f630fb45798974dc22455e9e99509829fbcaa479f36887c90207d7b6f087e89c9e113bb44df8c4221dc4676129663740812a9426d84a1d47401 SHA512 33bdbf7e21f1135c0ee048943a4b7dffec96e018285e4ee2e6a1c6a7f9e595e27348c83af3803d80322e7fd12a59985a6bf6342aa6211ba95c74ffa20929fb5a
DIST pyfakefs-4.0.2.tar.gz 177627 BLAKE2B a52bd900466203af6170bb9ce92f1e5f73f246d576f12390f5b52224de34fa69a3a4c426319b701953f040e343bcf267e20ea2a33df62c4a46f6397f760330aa SHA512 ba14cbc278ece50142d441b7731b01ba316ba9f11e5d442476e12b8b678490aace9578eb3b2fa2e47d6805795ceaf85574d3c5fb992a098585597c7e96d7143a
EBUILD pyfakefs-3.7.1.ebuild 870 BLAKE2B 9747111d6a1176e1f095f24313bb9fc60fcbd96492b73b6268269bd7d177c81afb0671fcadbfba9d42557bd7ff16dd9e9eff19acfcdb8888895082791bcfa867 SHA512 b00d85a7831213a5cf428a0c01fdc6b3d5251cd9533a8b95caf86c553c0bfff7c2fcd342ed86d5ae37e611aed47cb08c022ef5c7963b1c7232d000c63d981af4
-EBUILD pyfakefs-3.7.2.ebuild 893 BLAKE2B 689b0b8470e1652b2a4a8b07fd4b653114fe06dd27d5c6cbf92a9884ddea12e9369c540445034cac8a992603f486d40ef111e949709c14ab0c578928bec1b8cd SHA512 68f886b385e8a9539e48c55f0113490504f03dfad5990a17165e6ddd676d92145798a2ed67645a947e8fd2cf8cc5ba9506bd4b13fd4a4617084dbc3874dc5c96
+EBUILD pyfakefs-3.7.2.ebuild 887 BLAKE2B a9e12b6bfcef5a56445792a8d13a494b2ec259c4ea43171b1ccc2fd81fa24ce1bae073d7463a95258df1c34d679ab73e14ad8d578e5885c49c7bd7498cf279eb SHA512 80422e709e4147b72a62ea9f0fcf03d63ec097269b716f0b73d89cc8c6827fc16c1c4e5d8163642a814f9d5bb0b4f2d437c57003dfb55c78d6bf4a9160e47338
EBUILD pyfakefs-4.0.2.ebuild 883 BLAKE2B c2f8841919d18ee508576c6220cffd28aae9850940e34f22558edee2ae0d05aa625c23481cca23f0a308d2a88f7354d06ad937b5cbba7fc23b5b849f4727ca55 SHA512 e39a85618b8cd7d063e5d2a7a61d924bf8cca756d281fb7a21bd14797b4d8405f5e307bdabf526eb5eb8d4e705ba0182d5c4129c1606c26a907f4571c6d44082
-MISC metadata.xml 370 BLAKE2B 9111da9b75b84d43a287c2d902b6b83b77b3c0e0a0f650fb73a904022304028678abb75f5620e93d15b0cac474b731c2c39ae2589a77e6dc96e1797253062e0f SHA512 674874289f039549b14d81863c992ab20053777049a25f3f9ba1f596cf345a7e463db7516738d35e78a5079f660fb63ec24e9029963ef0702d6c268eca384d8f
+MISC metadata.xml 394 BLAKE2B 634b3dfe1c293b5c4918de8dcee95766878982f71c1d73c169e0e5a6dc68f84485af2edeac3a4cb924b04d4f265b84be309021f9ab4a1d4b59c5aa13d5a9dfce SHA512 4320246ff77e0e68f22065ae24232541bd1a2f6793706fda02fa6b0ef89eb3b3322d224026024984ada6cca4bf468512dde648f54d8c7737830b3155531921b0
diff --git a/dev-python/pyfakefs/metadata.xml b/dev-python/pyfakefs/metadata.xml
index 0a79b8f3f70d..4c153f30ad75 100644
--- a/dev-python/pyfakefs/metadata.xml
+++ b/dev-python/pyfakefs/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
pyfakefs
jmcgeheeiv/pyfakefs
diff --git a/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
index f2c68f229024..63c13e029398 100644
--- a/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 8d3008de3db6..f66cc6d4a148 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -3,5 +3,5 @@ AUX pyflakes-2.1.1-tests.patch 7973 BLAKE2B d0b6663e9bb17e301e78104c08440a9bc749
DIST pyflakes-2.1.1.tar.gz 58072 BLAKE2B 68dccddae2a9dc77f2d1f1251c80e2552935281b6b79e55fd2a0805cb30bf5e1c227b60a7e1f55f5f92ac42dfd18a69eb0b76ce06f43ac1c48dde3921817a271 SHA512 7ebf5843b38146305c1063e070480fea8ec3b47fa1be546b1fafaeb242a688a5a001f978e7257fd71d5905b9a338b466ef17c7330725191587e9c40ba632c3f8
DIST pyflakes-2.2.0.tar.gz 65307 BLAKE2B e48e0cb0497f90b6482c0fd08c182d766ab50755fe348352df510841f4ad43f7c1d6486753ce774603a3624f49c9b0165ad930bb1451ef30cf2e828d732e0652 SHA512 6a411efef261874c216b71bcb095412448a8cbeefdf7fa5577d4f4edd48a4a740a4433665e87e5dda2c08fd9ee3bfb7f134f56c7523e1303243edfa92b0ccb35
EBUILD pyflakes-2.1.1.ebuild 783 BLAKE2B 01cd89e87b0672a234a24fad49758b3d391e015bd299aa01f5b33eab2e80b448506d28a44dbcad683138738610cce62f602c4b4eedeba02b8e17d82531b2f7ed SHA512 82b30b8e7347b0487961945619a09eea21a2f6c4ab3e21fc2ee817b5aa05d197b4e78d2b5b2e68a2a39811d9c7138402ed0c99a61d687f2b9a09f0173a144ce0
-EBUILD pyflakes-2.2.0.ebuild 636 BLAKE2B 0180c1457065505ecff3ddc7e946a71dddd6473fafabcb0e5126c638a0d07a48f56b1a823bda3c54c7c468864025186c64a0d3efa0376e78027244c860ed9531 SHA512 2e15aaf48f0014aee36fdef2efd34a98959c63ffbbbfafe0f193f38b77e9f1ee4f44bbea74a99207a45b6d79d196d7074891c9f49ffe071a1d5f0cf1afd9a5af
-MISC metadata.xml 738 BLAKE2B 5c1e0cb1452f9aebbefe7edd7a054cad85373344f834fb88ea37414ef69b12a36f774e6da05e73b898d6300a56189ec80891eca7a3c225c95b0fc8755daf18b6 SHA512 6ac45c3c5d1fd3eeae5c8ad9950a2c97ef31d0bb72e6034a1f8b75d2a28e997660df20719431ee138a76544942bc20d609fb6e4a26a77f0ef30f912c6d2c0257
+EBUILD pyflakes-2.2.0.ebuild 627 BLAKE2B 0d662e047b103e6671f1979ce2d995b00cc36ca7f37caa6e2b50c1234c64c6f6fcc48a68546425f42123684e5ca6c108261ced6fb88e8a58a3af2f89a82cec9d SHA512 6611e6f369b1307f25ef4c14015bfeeb227833c4ec9c427012325f3adcdb9fb264eb202fe1a86857f765b5fb96fdb99e2ae52887b71cda9276df2b5c46c34e34
+MISC metadata.xml 762 BLAKE2B f31d372e281fb92fd01a1bb9e33afcffbb020fed4f82f8c549de08bd4b45619f914ccbad2f60e88f46cab9c3932003d7db353d79548f825a7e9add773b374cfc SHA512 d21377d6a2d76377928b0ca8db8d17673e9f188183141f8b4b980b9da90572ca68bee0e12a71bdb79339fe7dbec8a1e4b4aee344275280e4a61f08ffe9ff6996
diff --git a/dev-python/pyflakes/metadata.xml b/dev-python/pyflakes/metadata.xml
index e863869c3e50..3444cce75ae7 100644
--- a/dev-python/pyflakes/metadata.xml
+++ b/dev-python/pyflakes/metadata.xml
@@ -13,6 +13,7 @@
to sit around for minutes waiting for the checker to run; it runs on
most large projects in only a few seconds.
+
pyflakes
PyCQA/pyflakes
diff --git a/dev-python/pyflakes/pyflakes-2.2.0.ebuild b/dev-python/pyflakes/pyflakes-2.2.0.ebuild
index cc7b91a291fb..c9d537394f5b 100644
--- a/dev-python/pyflakes/pyflakes-2.2.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="${BDEPEND}"
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 33d61950cf15..08d10e689bf4 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,7 +1,7 @@
AUX pygame-2.0.0_pre10-py39.patch 1174 BLAKE2B dda7880b7a57e62612f072ed25c9c661ca63665d94d3a8fd9bcb2d95683da80d215067e63925eb65d98b4bf13c53845b7093011da42c4403c65bb95253a6fecf SHA512 91900ab98546a5339fcf4d204e3d049de9ad9bcc929dd75fc39629d873532d9e486f35ba0236e74185e1b7298016cc419c5ca1d463af80ee7f425244b7f51ade
DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f361e9e0296b5c7d57c5949d3434a040d028249c5b8f3c865ac3dcdbb32e6f0b223186678595a8625213ba2a17 SHA512 d923c554203a7c35e37921658cb4c5bf50215ab0ff4d2b869a1ee6b2e2ca31d66ec4bbde4287f5a777838ffe932cd15b993cb0224b86e43d684de61c35acbcd0
DIST pygame-2.0.0.dev10.tar.gz 5567274 BLAKE2B 7d78f260318cfabeb33f1073ae210f890d2f772e3ef302f243cca67724c6012355644ba60d4cae6de72db6dd61d320177deff6ee83dd355ec4cc33e841b565f7 SHA512 4cee7599fd8a6d31ddd66bfaad3bbb67cb167c1ae339f37e83322d810fea8746e81a191c224a0eeb6cc43a64bf1730ff0886c82f1a4f642e2e656ca9a837bf9e
-EBUILD pygame-1.9.6-r1.ebuild 2117 BLAKE2B d9635c59a2064809e8e8e4a6ffe2f0fecded0b3a8d49439210dbc01aa9f3fadd582fcefab30af5ec9818be34d3269c82f84553a0be94cc22a5d17739dcb98588 SHA512 8aa1b69e1faa035bc37b1ad57bff067f27c51d3ce7bac19a83d3c8c65075c956ee58547287e14c14c3745b3a232ebd0b8c8f845392ff6d4e8100225dc145a825
+EBUILD pygame-1.9.6-r1.ebuild 2116 BLAKE2B 2b642b358b8c5f1ad9c75a18f9bf81f3fce36e7e213cb977efeefa77965c2c323e122a5c3e4362c9105ebbf83cbf377c3153cf2dc5a3359945614abde5ea3f8e SHA512 27ea4e4f7dd1eeec851c2f58844a932218decf17be1fe999cf02382cf8c451c5909bbb39f3e2f7953acb4eb5bf6544e9149d3a4d6068309076edbd303dbe5930
EBUILD pygame-1.9.6.ebuild 1764 BLAKE2B c70233d00aed5294fa88da407f836ee06093009855a7165fd735a9f260e4f588339c0e56f9c934f0d74b14d65e703c491c21de481fbceb3402ecedc677e21c5d SHA512 50423f254afef8348078a141e2ceef4e3032343face6695be6d37d815026fc1e99c09c86448636ad29389b174f36560aa9e1ee58269e6a28fb1c01c4a979bc03
EBUILD pygame-2.0.0_pre10.ebuild 1834 BLAKE2B cc73979a27f3af53130c184958147015db1b769b8f2ddb97dd3921c4aae9e72b65a0f125a246d00df870119020fc6fde1c89f017f7d72ca4de5dc0eec1e19585 SHA512 84b0fb7c2bba04335f33c86cddb4cca6941db0a8a4834bb428389884e3e00423d36161d2fac0d3d5f2b83e72d8d39c26e9354b038af6e895bf8411ad1fe12127
EBUILD pygame-9999.ebuild 1638 BLAKE2B fe75a0c2d94974980b1b6462c8a3e5bd08b881606a541666ba6642304634d8a688a2dcb746d92854c1e68164b9cc07e904f454bcb87eff7315ae25f8767f72a4 SHA512 d5be31c553fd9bb1f4fab7084ea7553466086a6f4f68322797fc62c573bf562dd055bf9f33cb2deee614061224f39ac8e02343dfbce52c84b4abc204dee058ab
diff --git a/dev-python/pygame/pygame-1.9.6-r1.ebuild b/dev-python/pygame/pygame-1.9.6-r1.ebuild
index e47cb5f359bc..89eb5d201d14 100644
--- a/dev-python/pygame/pygame-1.9.6-r1.ebuild
+++ b/dev-python/pygame/pygame-1.9.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
IUSE="doc examples midi opengl test X"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 47177a432490..34ca9a391a16 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,5 +1,5 @@
DIST pyglet-1.2.4.tar.gz 2122017 BLAKE2B 6e5e24ec78e24b9a9c8e9627791ede93d740c1af7af0176c6f75409c76981fa16752bbe14c9b5ec871438f5468b3587e7ce12194241d94ab3731d46cbbe395f1 SHA512 70cd781936db8c8c156499e524ee73520bc90c19461074264abd62a4854307ef090af5faba521686f247fb4cbee552a428892f59a5b382429acfc000f4c2e22d
DIST pyglet-1.5.3.tar.gz 6356079 BLAKE2B 517b196eff334d572d4db181ce0480c3af8e2bc4a92e23e1fd7c335aedebe3afa493eb3f4745d8daffc3c7d930b9e333075014d2ba5d4303f4691c490a09f252 SHA512 12e7189272b9ab3b4bd3d713d0e979cfc1d76200fc8454b31573fca29b179f99242c34a1adb7a1c2fabb7b950cc3006cfcd8b188eb2c50ae95cca95b0e15582c
EBUILD pyglet-1.2.4.ebuild 1033 BLAKE2B 4f8c751ac08ea2d5d6fc1ebe1d74143311a2fe8834c7ab447f9fd42e606371f463f39b7b6e37e2b3767213b2bd1455cdfe06c66c2020946a656fe00312d2d4db SHA512 1bfb9ffc5e0db92f8b01288989ba8726a27e1316168a3e8d836a601e379ac4c5d57665e002863da205ed1e7768b24987423ac24c88dab3b34082a6d5aa1e3169
-EBUILD pyglet-1.5.3.ebuild 1246 BLAKE2B 5beebbbfde2a30bb8e1fa10a06b9ecc2521be8786bf0c3d43ca6c6d03b0872995a4cfd8eee1b0594c5fdf22f149bbf9741fe5cde7cc06e3ad74ce66e1af8983c SHA512 d497a9119656bf33d013a2b7fdd0b7646ecf63f267f8b046a5d436d672bff01a9be76a57d55060ddd6080c90bf2b44aea7cd48e7c067722a605e253b4efa9a09
+EBUILD pyglet-1.5.3.ebuild 1245 BLAKE2B 00f69b7a1bfffc9de58187d97fd90effd9e1d1d41541078a59977ec0b24afc374847813ef15ca50a539fc17fc1ef295b6258c6f394c48f30cfb13eccc1f881f1 SHA512 e2513d0b87f2c64de0b065a376202d278f4da0a368c9fcf21a94cbdf3d6ee2da738f5089425a2c3f629121ccd0a807eae7e3b4cfe1190f298ac386aa21eafc54
MISC metadata.xml 996 BLAKE2B 74fda944aaa3954eafb31e21741f8cb599c9f8bff46c662a598cb384da9770d3160302b37ce8cbe9ddbc7dfe63c594614783afa568ab4be5e73db502fdc3a095 SHA512 a13a1aa2134de7bc7e007f81540631623c5a3fc1f5bfd4b6f7bc744eff8cc037da321292aa968184d324099dbfd87f608d7c0a2aeea90707c27aee5532a1fe15
diff --git a/dev-python/pyglet/pyglet-1.5.3.ebuild b/dev-python/pyglet/pyglet-1.5.3.ebuild
index c583e7548a71..0a3c7d4dc12e 100644
--- a/dev-python/pyglet/pyglet-1.5.3.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
IUSE="examples image +sound test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index 5c944a1a042b..1923d8918efe 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -3,5 +3,5 @@ DIST PyHamcrest-1.9.0.gh.tar.gz 57650 BLAKE2B c497688f03ec3b072d8ab076fc096a442d
DIST PyHamcrest-2.0.2.gh.tar.gz 55491 BLAKE2B 749f227b8cb1180a64e24cdbf97b6f610b9871b21215a761642d19fdd43ad8e175718b12cfb0de2cdb5c6ae8c3c5271e04b7c3b489e01ac689769e24202ece56 SHA512 d6e510ca1e6533b425b424d411e23c4ee2a6bad2d635695e4e68f991fbdc57269c3a433361e431cb5dda7891278951d5de7a05f5c1c167714eecdaf74644d1c8
EBUILD pyhamcrest-1.10.1.ebuild 905 BLAKE2B 503de3051f8cb82d602a0c193661fa6a6e5d5fac4913e92370504fea9522a80af5fa3c64f2e6ce6a81a0f6b9076bf3ee4a05acdcc1c0fc5cba39527a6b15e519 SHA512 aa475c5f14a7de091b2f3ea7883a7276621a59fd5d85c9447d2165a1b6b7716f9a2e50976ff1cc53e0c9c4568eec2fb937d82b186899d4d8d8331edfda7ecc58
EBUILD pyhamcrest-1.9.0-r1.ebuild 1732 BLAKE2B 1462d6b579517b98dba0b0cbbba8794586ae6350f389f8c50bea47eaf43d3c34ec59407e6da42aecb4c40e88892236c9ba77dfe47b13c86624643f810f655905 SHA512 604cbaaf356da559abc145c90649ab0ab5e52c6c8fd19852bf8ea57e08c7e3b531580b7a2970681c61cd5159a08b57a82e58518e8a12b16682b688855f1175ce
-EBUILD pyhamcrest-2.0.2.ebuild 754 BLAKE2B 3bcc31478f8459da9dd0eddfd8cc393a17b8444e3cb572a4a78d00fb11b32aeb6209d3abbdc8cba10832290e63601620e37a5b4ef7426666f1876313fa71f624 SHA512 02cf49fc3ec5b4f93e3182008bd16794bc727020fb65809fc06f91cffe692d655689e070d2bd935cbe94441cbf8ead69633a1e9e8186ea1ae40fcad2036771a3
-MISC metadata.xml 372 BLAKE2B 73836583934bf3547c74ffa03d6187a30d71b50e6ad9d7b8c25a5f2fdbd276c735c3d3c39636aaa3e48c84daa0d559ee70621331c211a259148a771a7dc4f9b7 SHA512 7b8e3214627548449a3f0c6d70120978fd2afa5636db2cdfe0bfe71d5a2c46aa33975e29661afd851ce920508559c98d98285265297425b2ca7de043b887ac6f
+EBUILD pyhamcrest-2.0.2.ebuild 745 BLAKE2B 3b59e7a9ebf959a03278f4f1440de3715913ff9b60f3176be3c8cae2a105721e035cebd5e04494537a7e2d4f7378c928478d1905044f9fba004b0850572d274f SHA512 3a9bd0abd01d03493936c9f382727c549c341f8fdca375a891bf68b4fe6fb96158cd15e8c26ceef040bf804431c553b580fd1cf5e2d32422f845704c0ef848b1
+MISC metadata.xml 396 BLAKE2B 1086960a423e348fa862f395703ef468c4e2a5a362e8fa78d15cf8c2c0e56f8bc21627688c1295dc57014cdd91644ddd81037fb0505ef1f43e2e8c93bd9774a0 SHA512 cb07fb7bf1b7af660af9ab2cbba7f87a51afd254fbb5896bed0dfa07f98dc2a6d0361e567eb9cd240291cffcabc8eb3f3427809e1ce8b95b1de36d964d8262a5
diff --git a/dev-python/pyhamcrest/metadata.xml b/dev-python/pyhamcrest/metadata.xml
index bb75201b6495..5eb981bffdbb 100644
--- a/dev-python/pyhamcrest/metadata.xml
+++ b/dev-python/pyhamcrest/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
PyHamcrest
hamcrest/PyHamcrest
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
index ec73612b5ef1..0b57b1bb6ce0 100644
--- a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples"
distutils_enable_sphinx doc \
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
index f1efb4ec7df8..a9b78a021ac6 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1,6 +1,6 @@
AUX pykwalify-1.4.0-S.patch 862 BLAKE2B d92c4e8d4d85d28f6df574bfe2f1ab0aa82c32ba8ce2b4a2d6ecdc21fe1db4056351b6aa6dde04d897525ce596ed492781bd7dcf0fba2ca5970a3af79a9abf3b SHA512 f7d9189993cd73a0412ef01fcb01a99fcbc61edc6863a1997333de085294b9c5772d026f7ab8f16703568404f2ff76bb1aeed760d7908c7865e0891ad5752dc9
AUX pykwalify-1.7.0-test.patch 1873 BLAKE2B a95d46378faa7ef87db078d44fdc5b3121bff303cbdd682907a764b7a142a8813366547731cce54424a1900b9c3ae3184f3b98a1519687063e8cdcf69c953457 SHA512 6b22feff5efbfce01f46791a8676d39839e5e3c5498253dfb2b80ddf7f96d3f83978cbd7378c15bdf9a9a69b4143a5643e034156d66d134dd962dde6de7b8023
DIST pykwalify-1.7.0.tar.gz 69402 BLAKE2B ad2ecafad8457509a5517917cd3bbb078a244a9ef96e5560efc4f6b0c4a3939df7f20a9e3e72e43be97edb8af6315d49e2c2f3248aaf17d3c4f0962f60132185 SHA512 d0db48814712dc26eeac8f00ee0751a006c8b00521c9829e3c1a4ecedd6083194e9e28da1ed3c13eaff30d9b5c3dd1dbb499ba8864251400e34c23911110d848
-EBUILD pykwalify-1.7.0.ebuild 803 BLAKE2B 46e39c1d74d729a6a0d2bc6933048e82d491c27c6c9a8d3811d0e874474f122be0fb757c8a4d00462d3189a67e627c44e7a552b11b7d103034ccdb3c863e37de SHA512 3af2eebdc019e246fa9147f02a318fb6f37bf854455c2a669a00aba47bab84438fcf532b4fe00b6b506a0bff834853ceaa04f9c7a76319a706822e4736d78af6
+EBUILD pykwalify-1.7.0.ebuild 802 BLAKE2B 1b2545835c4f7ca844a978dc521d83baac76a2788d2eb7b65544f2e77123d06fb2bbc15056f5d73564677b878cac23f5cc8da9a07aaf9bec120404da8952cbf5 SHA512 d79cfdcb7689f9444d317e055c49bde31afc4dca09e7429a350787d225bdb39d6b27cb65c01810f452de7db0c651f2652197d7f7798b2c063d65a96ff8429d2a
EBUILD pykwalify-9999.ebuild 904 BLAKE2B 1ce13b42c7ffb139fdb8e280f24f0a6cee25d092d361f5cde11ae6b3bb049103dc5905dfb96da49b39105fc543c2c263c55e5ba47de7e257479f0bb1c610d8e8 SHA512 acad7084d3a4302d1a75d03f3c985551fb8c067453a3c147e644c4b8e5175457e193f34c8b23d031abdcf0a9432628a0bdbe6b4c665fddb83cba468d7ea0d3bc
MISC metadata.xml 369 BLAKE2B 8c31d9164a8a1c9210a56c2f7f7a604f2fa2bd4bd7de3047420074af8a19a63f12ec18f4d5c436aa28533ea9d7e15307ab99c114cb8a0aeea419ec1d185ea7f0 SHA512 a99ea380231e9e3537bc693c2bb1ffa6bc250ec086f88bfa19a7c7a8df04d21be8dad752535f8e89eee4fa989b79c38e998946a44dbd9bae64def2cd2e858913
diff --git a/dev-python/pykwalify/pykwalify-1.7.0.ebuild b/dev-python/pykwalify/pykwalify-1.7.0.ebuild
index 9a7d481aaabb..357a50ad9e8d 100644
--- a/dev-python/pykwalify/pykwalify-1.7.0.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pymountboot/Manifest b/dev-python/pymountboot/Manifest
index f67c8cde1b32..7f0a5c191920 100644
--- a/dev-python/pymountboot/Manifest
+++ b/dev-python/pymountboot/Manifest
@@ -1,6 +1,6 @@
DIST pymountboot-0.2.2.tar.bz2 4098 BLAKE2B bbfbe631313189e6aef684ff29e73fcf2dcbbb998528103afe9c89e517e5a6c13bf6e05ced7c2eb05f668e0cc269212618b648043b65fb95da2e1b46c37476ac SHA512 bb6ec0772300b2edf9864a09ff64f67ad99f0cd29b009793e1b2a590be48146640c927b5772023d27e68fc2fba51652a55ab66d1cf875dd9b4134f043ac353c9
DIST pymountboot-0.2.3.tar.gz 4065 BLAKE2B 81ef6c967a2e8eaa76155446e0c59208ee10e5e3b40fbe9d910d5e4faf3ac1963146ef1df634c4795b56e709b90fb92edb57916586c8a1e5fa14ad92e1721f42 SHA512 fee4c8444b89ff0375c75eb44ec396d1c1e65d4bb08ff230ae0fdb1f822115ed44bf9904c284d3623768df0b4041ef7ab4cf9717596148d3df76badd0a3aa92a
EBUILD pymountboot-0.2.2.ebuild 513 BLAKE2B de470a0cc808589f36080ae6084a21060f8f1c41b9f77b8819540d4f89a4ea4218533ea8f675ef13558c047c2cc3c79843c4d2cf9aba55ff5742e1332eeeb42c SHA512 1b825d040a06986c839e15ed7c1132bde9a83d4a410f862d663c795f093843364a03425ce227e9ade1cdb62dfe059832aa14f32a66e78de331e16e4ebcbc8465
-EBUILD pymountboot-0.2.3.ebuild 511 BLAKE2B 63efbf7e8c221a824a803ff882235bff95c42119e1aa109fb6403066b19a8af9d56c0b5fd5f07041cd0195a009a78589b4e51c5932b51841c7b599816b1d63e0 SHA512 7637b3ca4a1d2e3498405db19bc507f7f8980100f16933fc90de010be162b36665f78565ad2f1b74ebfe7258c7a49e4e17ba80da73d4bf66a643df751d16ae64
+EBUILD pymountboot-0.2.3.ebuild 510 BLAKE2B 3621d4a9087f08bfddb56b7fea77d59ddd2b18fe35a2d3298a972a5a398872970f3981a79cfddd6a5e9d26786758932ae6919856abfefd613e3889fd00c9eb66 SHA512 939a14f70c7660d0180d4723e849bbf3dd24f09c03e72596b5cca97150cfd5a95d2ddc97320ac34afd9c4e09446e518576ff75464d2933d933037ebb6e57746f
EBUILD pymountboot-9999.ebuild 470 BLAKE2B 03c4de0bc0a5934f2081bcd9ffd77a49b61b054ec4afaa64dd9b0cd395c12cc1568cbaf716c55a04a1f7a2efd65f35247cd9ba7a21da8e75936b65417b9a9498 SHA512 21887d274fcbbb4b43920352a76f70451a239fc525235b3789530deadd9fffce3a25d5a8ab50fbafdbab584121b1d59e85af413f013c535d82fe78f86a582caf
MISC metadata.xml 533 BLAKE2B 682a500aa018e96494eebe8a43af1bdd269fc0a0e049b2b022d014bd8e977fe8160202263d5d6ed5fb5022551ceee3b77ca92f58cdd272faa00141995afccfb4 SHA512 b0708a5c130422d6d5150f1a1d07386ea3494fa667acc4e05f41550d6c33e7334b559fd0b3e71bdce67b53e109ccdcba4e845ad10a0fd39b6505b8ce8b27d17c
diff --git a/dev-python/pymountboot/pymountboot-0.2.3.ebuild b/dev-python/pymountboot/pymountboot-0.2.3.ebuild
index 4d0cc67eb79d..e6f6a0620df7 100644
--- a/dev-python/pymountboot/pymountboot-0.2.3.ebuild
+++ b/dev-python/pymountboot/pymountboot-0.2.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE=""
RDEPEND=">=sys-apps/util-linux-2.20"
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index a80a8f7e90e2..c827652a2803 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,5 +1,5 @@
DIST PyOpenGL-3.1.0.tar.gz 1172688 BLAKE2B 9865a10e8b5d2756192077b4b079658c680b9f47bdaccb33285fb1942bc678b29f6a69359a1486ec023b1a73d714a7e0209b2f57776fe8b5e4a5e2d0803dba4f SHA512 f748017ab3734c7672c3fdbedcea80df297a91a78b111533e260feb0868ebb02935666c041f77db03841ee8f90057d9c53c53b00b097aae4cf67a52c7fc9c2eb
DIST PyOpenGL-3.1.5.tar.gz 1835295 BLAKE2B fd3b3e9970b3e704b09128402b401e23c584ba20de23082d019f5ab9e1e222efdfbd2e11ecff6ee748f41bad3a5ff089c57a5c354092e2f717b13e18108de2af SHA512 5d90fc68040b4886e46ff69a59be9e3a8e31e3e1295283756db86d50a1efe681986928e18eb55d20fd2660f863653301ea483425bbe24046f55085b44f4906eb
EBUILD pyopengl-3.1.0.ebuild 810 BLAKE2B a47e25fd766eb0c4bd2bdb8dbbec4eaae34936d02cd0e268679beb48448f33f90e4ded506356d8abf41e99e2cec8184b687f5516238d7e19ef2eb145be144811 SHA512 d2bd32acd53c2eba0503aee69b37297d6828e83d45532b9d206c63d350f2a1d61667a142a3f7a5b4a44f9031bf0b9a821c076f1b89f75c89975e182944095af8
-EBUILD pyopengl-3.1.5.ebuild 1224 BLAKE2B aecd4848a00d3bfc65f83eba5833ea8f7e069152e4655fb2cb2b0adee4e5733511f555d7537622f7f7a6d48411e5556bb4ad120294a36d2b4b8b04bddc673bea SHA512 c3998ed86478fd7822b093e5495cf3668eb7a07c96080b7f5daf763667de8891cdd2dffc3ccd376201bf73350dfb6d67c395ef6feefc51543d217dfc94957847
+EBUILD pyopengl-3.1.5.ebuild 1223 BLAKE2B 10c2855d4a1dc844a61f4f872af66196f24fea7a5af35c74fcd41acfd29dd2c2cef907079e0e6286518f16bca59c2c23bedf6062d748d6e68e50d87e1037bebf SHA512 c168f9f9bc1ba5021274b3ccca6016c8f69d40f258a3aadd7b26e5bae0e9f5d13d005e3ca0d6c71defa307bdbea6e07425136fa5636b0bd0eb89405232a530b9
MISC metadata.xml 364 BLAKE2B a831069125da49ab322af6f4d615d3091865919e26a1cd66da5a760a855ca81eb38450f8707c9346174871cb3055fb5085944a46c1fe22135a8f4b81c7ac2117 SHA512 7f81e0f6a601ff3ddd04a391380882edfa45f801bb4afb6fa04673395cee74968745016e9a285908aab6cd701f62b70164b9885493cdfe553d52f30d49509546
diff --git a/dev-python/pyopengl/pyopengl-3.1.5.ebuild b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
index dd2ea51d5f2d..6ecfda39b442 100644
--- a/dev-python/pyopengl/pyopengl-3.1.5.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test tk"
RDEPEND="
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index d86d9d0beb63..9a2b07a82c26 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,5 +1,5 @@
DIST pyparsing_2.4.6.tar.gz 647543 BLAKE2B f6c93fa1e9a7ece4cf6abcc74dae0c96becaf7f50eed5437a6410166e80768c17d429fa2d1e4d1958b2a7c5ad6ffd18218c5160bb0ebe03ae2963014612eecf3 SHA512 475b77f469d2051fb067796849f7c7d3df145f2c6cefc708c904a5b0af22661b4c229c521c2cac3c94621dde9bda6b28e428a8e31d936df6d4596d993263981e
DIST pyparsing_2.4.7.tar.gz 648158 BLAKE2B 24525b4ee7876e245b9eb270f0e3e22fe2d8b398f9777ad3b3657b8a1227dcbd25983aa64a3f3018debdbffc1a042c732e6b3a09800e081c7acac7b97da15317 SHA512 c7a546729f86a2b5176e2482b566b9fd715b03e495aaef4d720b21307bb03f385dbc849247f8d266cb3d92be0a83c34ce4995b655ce85318355d5a0d42d6991e
EBUILD pyparsing-2.4.6.ebuild 1005 BLAKE2B bed1f78b5b500b888274bdd0e7667912e6bcb974de3162e986735a4f0a7ab640eb76b83342ead7b205d87617cc615a67a976bc56dcf9ce944ff495994c065c7f SHA512 8e2027117117eb247971eade420f0fccb5712b56f822d28fd05dbf76e8a108fbb6a777e6f491898ead5d96f88c3fe44338a0cb08d491aa11dfa71c0baadf2af4
-EBUILD pyparsing-2.4.7.ebuild 1016 BLAKE2B 1f63ed74a3de89f066687ce8507dc90ce58fa5e4cb788505546b8794e0f7587f1fd9f1c7e4460d055b08b3215b218094b0a1ec13c1b3f824a31ac93b359b3e25 SHA512 c7cb0930c1de7aa02174f436e082086bd856009d8d860e08fe40b2b5b061ab4a60ed3903b036a1389ecf7f65db7c3f18a392fe4f4bb2345b6436319467449e20
+EBUILD pyparsing-2.4.7.ebuild 1007 BLAKE2B e5f921041df7b76129ee3a4f27b16bf6f79120d8dd046ccbbe3238e6b05783e1e73cdcc7e866da5ebd639eab4ec19cdf733f3eb3b10a7db2196d1ee5f0875c17 SHA512 8df4a7f9eebe49308a375f8ef16f455ed7a73a03326bcd0b75c475d67b09fd032a0127cbffd331b7a7acde5f1f70d220f3e1200b84e825bdeb12033986b6b996
MISC metadata.xml 762 BLAKE2B adad994029179676a767488775141e8d79d51803f1fa9546d85c33dfbaa2a656e82bbd1c684c401bdccad5f2be763878296f149c9032097f1db87c60865dbc7a SHA512 7afb6c24b323080e02f552a35c89e7b0117482ed9edf5ad28e845553d98db9ba0d02919419ec8029bfc431ed39c5b60bc270360e6c5567d34e883c819b2ca9c1
diff --git a/dev-python/pyparsing/pyparsing-2.4.7.ebuild b/dev-python/pyparsing/pyparsing-2.4.7.ebuild
index 66f7c8b3d850..0e591f5e691d 100644
--- a/dev-python/pyparsing/pyparsing-2.4.7.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.4.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
distutils_enable_tests setup.py
diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest
index 1efb58550173..81dd08262397 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -1,7 +1,4 @@
-AUX pyparted-3.10.3-greater.patch 342 BLAKE2B 857734d2466e5d1e9a9b7575dd419778361e5ad65c7cb8e6eb220aba2b3bd0b6aaa06367767c2708ef6986ee11d44f3bdd8bd89194e5d2f85ed2e89fc06a2f42 SHA512 c7a22b6fc2d72c0eb15f0144ea023cbc56257d26afa144039d528add2002af663fb2bc54420216992e32cc77bd699c60b2040291749729468749a09f890c7e2c
-DIST pyparted-3.10.7.tar.gz 99879 BLAKE2B f2d03415ec7623fbe25aeab70e53646aa5e576e9f20ac41ffe6c859be9572874579f5720b8d05191107f4143e2c6dd14d83a05798a345fa0ed8a81ce2634f599 SHA512 c57fed2a8d04511b12891fd59b6dd6840439aada7e5ebeab14a56e6e4f201c249046ee87d9d25af1b3f02960994efb0a2973f25928a9df85d48bbd1bc196ab07
DIST pyparted-3.11.6.tar.gz 105633 BLAKE2B 8c74fb3521f94cf726365e91954c56a60bc418c0e18c3401dc525f942169b1c03ade5fa35d5053daf4a4568b373e9a8771e50c76ea5b51c2f6351ce62ed2bb21 SHA512 8c3a86efb21c212a8f227ae324896552f45568b8facdd76729f5acf15bf7d691c1b9ab9e46885e4fa4e0c4c7d60314e2abfcbff212e5dc158d27ce716dbd50fa
-EBUILD pyparted-3.10.7.ebuild 668 BLAKE2B 50dd8bad688d79defe57d32b63ea3c9d63f29151f46b1e68d7494dd983f80f1936636a8d11904fe85a037a3c54b015c8e63e12d7f433f15fc8e1add3801d2512 SHA512 9e3d0a98b28178588686b0330912f1d90c6d25016e52169cbe7faca56104d20407817c2de0874395049e8eb71be5f3e2846ef45488d7c5f7dd6cfbc86c0e3996
-EBUILD pyparted-3.11.6.ebuild 642 BLAKE2B 2afd7c36d31f03b9ca7cf3851eacdab866f59eb2829748c7b52148485cf584aa1c3f9d0c474fb73d56fe8dc04f5934785d31467a908e8ac642c092ead45fa410 SHA512 d4974de3eafb919e8ff59621a92c2d74c7a26a89d4905a416c604964958196283fbc7441e61c7fa459aea9e0cb5682a3a5f360ddf07ee74149485d6c6beac14f
+EBUILD pyparted-3.11.6.ebuild 636 BLAKE2B df3d93677ae29972992284b7b3b336b75299dfc41dae1f793db4ac65d4e89641f01646111a61dfff7fa60c301e53d90f2c5e7bf134175d2810b094e9ac25d63d SHA512 5b4ff71690e7576cee912b9a45e109bb3fdbb654ea53f4b147950bb2f35b1a441f8c546c5311657f10ea7e84cb79c158a613735ce6feb63819cc1be8c230d7ec
EBUILD pyparted-999999.ebuild 591 BLAKE2B b723b15e1d8f84ce455925fbb289d7a1d46577f0797d21c146319a9704adaedce7dd3683ec0685df23c2205286010e651ce137ff565843553e8724e8aaec1f4e SHA512 def1ed802ca8daa42a40b232d0d61fbfa33dc6f98200cc365c087485ee942422f8b061f27032c733edcaa377b7a13e6cc06c350b05259ea03f0aba1d5b72a1f5
MISC metadata.xml 340 BLAKE2B 580176d023e57197a2b4ce868c4ad2403748932547b9a6337fe63dcbabc43db523ce8ae7a5691abf3811995dddc047b64a7e00aca2f09c65e1544d0a172a9d54 SHA512 dc34de6235dd150a24b2cea6fd14028328a44fbfff6a75819c51fdd623f54b2f4bfa55f13cd827ddacbf11b0f9206c56025234948ec116e9df47ead634d8766e
diff --git a/dev-python/pyparted/files/pyparted-3.10.3-greater.patch b/dev-python/pyparted/files/pyparted-3.10.3-greater.patch
deleted file mode 100644
index 53af4fe34e59..000000000000
--- a/dev-python/pyparted/files/pyparted-3.10.3-greater.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tests/test__ped_ped.py
-+++ b/tests/test__ped_ped.py
-@@ -228,7 +228,7 @@
-
- self.assertGreater(len(lst), 0)
- self.assertGreater(
-- len([e for e in lst if e.path.startswith("/tmp/temp-device-")]), 0)
-+ len([e for e in lst]), 0)
-
- class DeviceFreeAllTestCase(RequiresDevice):
- def runTest(self):
diff --git a/dev-python/pyparted/pyparted-3.10.7.ebuild b/dev-python/pyparted/pyparted-3.10.7.ebuild
deleted file mode 100644
index 3f2af33a2dc7..000000000000
--- a/dev-python/pyparted/pyparted-3.10.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for sys-block/parted"
-HOMEPAGE="https://github.com/rhinstaller/pyparted/"
-SRC_URI="https://github.com/rhinstaller/pyparted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
- >=sys-block/parted-3.1
- dev-python/decorator[${PYTHON_USEDEP}]
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.10.3-greater.patch
-)
-
-python_test() {
- emake test
-}
diff --git a/dev-python/pyparted/pyparted-3.11.6.ebuild b/dev-python/pyparted/pyparted-3.11.6.ebuild
index 0d86d2409a49..4f6bdef24634 100644
--- a/dev-python/pyparted/pyparted-3.11.6.ebuild
+++ b/dev-python/pyparted/pyparted-3.11.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rhinstaller/pyparted/archive/v${PV}.tar.gz -> ${P}.t
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
RDEPEND="
>=sys-block/parted-3.2
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 23a0dee1f42d..2d11e930a881 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -3,5 +3,5 @@ DIST pyproject2setuppy-5.tar.gz 8314 BLAKE2B 7cb93fc0d427603adb8439d7549c276e879
DIST pyproject2setuppy-7.tar.gz 9274 BLAKE2B 5394543aeb7b615cfef5548b530d136887d81bff8c40dc343529d3e316e2f8851b82747d59dc9bceafdd7f2017695f523c75a8b376e033936708f76c64ebdd7d SHA512 22224a63acb0af5558b63e90aa2e96243c1ffc2ef9c114b2e20b8dbc5b84abc468879822d8d20f8dd2f7fdc2ce4a508b5f84e661831cf9e99e383d89fe2b63fa
EBUILD pyproject2setuppy-4.ebuild 667 BLAKE2B 10460232046081050716f4f181e5be8b862e5215dcfb0851e02596281f9b34f642d8216964731d7663730a58d2dd70a9934e7704f034a303788d5d8793e968fc SHA512 ada71311857f532cc1a28a7a22e2847eb891698e0711b6deedb5f3c9cbe080b2c754ce1dad75f2dfde48e3eab6a5a9e58f32885975fcd5c9e5e5af8c63ea5804
EBUILD pyproject2setuppy-5.ebuild 673 BLAKE2B f710e85ba57a344c5b0ff22f7a2173ddfef9267d9ecf508822c765718c75651bba689fbbb85a479662062dc382c4abfb9b478ef441c7c77a0adccd0641a7e4a3 SHA512 a70728a7911c47a4241920c51caee7dec86bd7a1acec16da2cb1023f22e2317601f562daf0a3817f9f95ae809679ae376944e778f0ffe467b6e9bfe1256c8168
-EBUILD pyproject2setuppy-7.ebuild 672 BLAKE2B 9128e6fcd656a7c8536359e8cbdd25da81f4cde711dedb4eb367f46ca111f7440c2d8ad24eec37f2108f4be46cc436734b09db01142101134df6e904a7b2376b SHA512 3b4b1609714c519b43434d42c4510be8599197c71ae334bc0c501904b49a804b03905e4689b169a03c36e536d10a4ca85ee27990c38bb528f34312b03fd703ea
-MISC metadata.xml 326 BLAKE2B 465cb8f46170cfced4ed1ba3af61210b58fba1c1fe0af7f5f9b5d498f1a32993ff19f860231ac84b5f6661a67cc7837aa8a19b81afc108cd44e5d836f3fb93e3 SHA512 19656915996f8905a7c2ea398da098d5ae704445273471730c82c3bc391d4662a6e7fe8bf9b416ce23d3c171008d93bd6b462fe278c7bef64b304b2e467d894a
+EBUILD pyproject2setuppy-7.ebuild 669 BLAKE2B 1e98b8c3bf257160a17c95ab2fdf5cf76590f62189ff533ed4963b291a86f404bc5026d987c8034a159a774a7f02e3d52fec6a1964727b5d734808c47f04ccd1 SHA512 b9f378c999be9c659d6628560fb58262536db9e3925d3d3441649be773fd28d05c83f526973bd9b496f771b83d2260a1132533faef659f5781e2660e3cf09ac5
+MISC metadata.xml 350 BLAKE2B 6308462418044a7972e38f09900037e4557be4e76a371b358a2000784e2f44f2f9ed5ce56be11ffc198003c3acbfb29a268372a33618c3453d3e01b33a83dbe0 SHA512 ca89ff54a01f7de3850201545f1964d19d4b909a9d0867178d9f39b180aa159d4f6aa5cc3483aef9358eff116d577d0c0a1c15f74d51f2253cf96e991d40e43d
diff --git a/dev-python/pyproject2setuppy/metadata.xml b/dev-python/pyproject2setuppy/metadata.xml
index 22e0d6d87f61..5eeef57d0718 100644
--- a/dev-python/pyproject2setuppy/metadata.xml
+++ b/dev-python/pyproject2setuppy/metadata.xml
@@ -8,4 +8,5 @@
python@gentoo.org
+
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild
index 346f6735e4f7..7bbaf1c2676a 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
RDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index 1c11057feb11..0b44bdcacfe9 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -1,5 +1,5 @@
DIST Pyro4-4.79.tar.gz 490917 BLAKE2B 421fa2d0b32c27c44d11adb7c89e24cfd7a79c10ae40827407d3d8965e98b7d5126168e5b00b042c4bd94800d3e73fc8febdbbbf2b82d3046584ea88106c4734 SHA512 03e75537c7943e1044b7e6623ead934e3004b023ffc6d364472868e0895e3819c4b3c92d1610018ab1466262f32681e69a91d360c33b17e687861c8c742bdf72
DIST Pyro4-4.80.tar.gz 515103 BLAKE2B 5d2b69ba020117947a36c9c75f884434a3452167fa2e586e3a5b0e6deb1d0c8c54dd06a20b9568b53a0a6c42a847d880636e3abe37090246d5f34ca84e915b36 SHA512 8e41285674edbe5c8d5ac63e33406c5ff7b6366d5dd251a1755eff81611193278a473ed8b15f995bc0ba2775dc5d316eb6a3cafd63626b95820591ea3a0a92e3
EBUILD pyro-4.79.ebuild 1368 BLAKE2B 6af0ed7ef59d58313089aea896d303c682143739ed787fb102364db389cb1c64e622a4a245d8e12b0d7c4308a48dc9735a9a34b3cbbb5b55fc9d81ec3ae7a8d4 SHA512 3929f706a24e30e5731f83b3070c860e80ebc648676c2050f3833c95f489d593f06e826a666db7be1741d1fefa6c8640cda4ad372ef7b198af6ed026a028f526
-EBUILD pyro-4.80.ebuild 1371 BLAKE2B 7a181ed193515308579e537426e5bf614236853730e52b2abca4691549b628391e9dbb160c5e5b326a5ee4d09d66ce55d1965cf651c48f42d45fe7014d7596bb SHA512 ef3d9b3ab4a03d6a65d9a4bba398110b80b6ea13096ddad670f3fa9c0248da9024888fd3942e6798e8692373d35c9e14212e1a570cbf6db90c9860568c4c327b
-MISC metadata.xml 370 BLAKE2B bf0ecf2b63d7e544a1193349f0d171d107d23e66a067012cdd0ecbc4b736631e3c78fabc0745e88efe711219e8c3ce187da3ac67f4477f8bcf4996546a56a94d SHA512 59ce12c791648049dcaac68c75f9d8af472635442b25c4ba81b37e89d913b5b1954dbc40eac44694e5093008cbc41256ef2a177de1906598bb876ab0ab17d544
+EBUILD pyro-4.80.ebuild 1368 BLAKE2B 6af0ed7ef59d58313089aea896d303c682143739ed787fb102364db389cb1c64e622a4a245d8e12b0d7c4308a48dc9735a9a34b3cbbb5b55fc9d81ec3ae7a8d4 SHA512 3929f706a24e30e5731f83b3070c860e80ebc648676c2050f3833c95f489d593f06e826a666db7be1741d1fefa6c8640cda4ad372ef7b198af6ed026a028f526
+MISC metadata.xml 395 BLAKE2B 00770102b68b0c2d63055d065b43a6f14463717b54aba5de8d89c2f8373c11a161445c9f1247887a466d7549c5760586c1b8882a3547e85ec45eca0cb241891d SHA512 e74a9c8c0cd3b95dac218e093b7bd13ce8052b5f7adad5287bf5f7cb4e159133ae3ee7bd1aae42e46c7391344eaa29be3d411216700659422be30f6615fcf139
diff --git a/dev-python/pyro/metadata.xml b/dev-python/pyro/metadata.xml
index 47aaae3963b3..56387a3a05c1 100644
--- a/dev-python/pyro/metadata.xml
+++ b/dev-python/pyro/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
Pyro
irmen/Pyro4
diff --git a/dev-python/pyro/pyro-4.80.ebuild b/dev-python/pyro/pyro-4.80.ebuild
index 456079265b51..9e1e384627f9 100644
--- a/dev-python/pyro/pyro-4.80.ebuild
+++ b/dev-python/pyro/pyro-4.80.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="4"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ppc x86"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index d5d68bbd3863..e41bc7f15dee 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,5 +1,5 @@
DIST pyrsistent-0.15.6.tar.gz 107424 BLAKE2B 432ce7223fee524cbcd65237171af6f0fa16d23dfcc65b7cb5bc8d19dc8216344bf21660d2acf9b07eb1bc9b883840c0b5de679cfe52a0f977e64cea21cd584f SHA512 42b259c66e118d5b09bcc64e57441729146ed9b40e9fd18cda83c4aa0523d5bc3acde3177113e1f2a1b5c1e3a14d15b369df9701a9218a88a656ba0359b5ff10
DIST pyrsistent-0.16.0.tar.gz 108012 BLAKE2B 62283b8ef478302964fc6b1869c3646c23b78762c5f4fad68aa239433c54d9c652544d5ce05dee18107c8f9604b689043d07f67b9396f6dce0cce3aab022e2de SHA512 d5764b1a185d4578bf308f338037e0546b06e79a3e7189b904e24e95e0e907bc98d7c1c68becc5549a541a5864df75aba6088cafa3558ecb0a63dafb22f5674a
EBUILD pyrsistent-0.15.6.ebuild 651 BLAKE2B 379b5169b1bf9ec52c6470d1398730189491c67ad65a0d756dacbd9cd8abb3a254bc29f3a415940380a2300c1e0694440d8176becadf236bf6051d1a03db1f4f SHA512 29d8d5250cbf300d3df5a9176631663e5f2849fb8347798180d64ac32a12a5a2381067591278757c81a572dd574819f6bd1792727e7903d5bb7538f63c5b84a2
-EBUILD pyrsistent-0.16.0.ebuild 654 BLAKE2B ad82b97f9dbeebbf6eabdc3f20bb76000e5bcb4a53d2d5b7aa22db3627923fb4943907e8a32c423c1ac9bcb7283730bc37d5b8c44a65d76daa335b33cd920683 SHA512 a9930a24e75a076c16e05a5e9b60611354224617c89dc882c21aa55d999ffef86f0925597fb85a39dcfabcd044a57e8627f6ff66f9e4f8e2005cf4556469e62a
+EBUILD pyrsistent-0.16.0.ebuild 648 BLAKE2B c25e867e869ce9271e9ab3022f346f0f05583dac244f9c6011cb24b75c4b7980d892bc5f0c0a25fb63860dfd6bce2b84d8edefefe3e97bd47e36ecd12c5e0dad SHA512 211dcf11df16a1dcf99ded947f2f18aa7ebba0734337f5e09e5a1a0d371a99045e566c51986f600522a6b3b12750693c94d82ab3e32e24e760709db6638ab7eb
MISC metadata.xml 521 BLAKE2B 0081a54c9db451d020647e808b80c47e590530bc952c40d3dc6c11e187cb6ff4c644c9c8c448b206ef3036a3a0ae07760e23ba88d41938667b0a83ab2299cd9d SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1
diff --git a/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild
index 213ff34df431..6a2cc191da47 100644
--- a/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index d024d281fdae..363807ad82d7 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,4 +1,4 @@
DIST pytest-aiohttp-0.3.0.tar.gz 6884 BLAKE2B 02b50fcd14192d23a4b257c2b7cb235966eff52b1c0ac87a4c61a20bc0babdb22eb999938c63e267a797d52ce57c9fb471232db3d0bc6566168a2d73f6404cd4 SHA512 4164166465dc40ff78a86304d1bcd4db9fb3f7dad3188f8ebe2ff151ed51eb0bf9c1b7a608d94cfe3339ee3b6efd4d5abbaa0691388460d5ac95635afa14984c
-EBUILD pytest-aiohttp-0.3.0-r1.ebuild 533 BLAKE2B 7ddaadc87068932e19f7adfe23d484a2e8dd1c4fdc317d53300ed43f36b49ea89b9edeee6babda4e24de630fa940de793f8ec3ff4885329e6ce039e6df8edad2 SHA512 79624acb3947f27b97bf9b506623ce07ac49350fed8480251e67ea8e2cf11aa077701a3d7f00f6cb0c592a7865deb40e51fbfb6cb52367a21d5ee0467550d6c8
+EBUILD pytest-aiohttp-0.3.0-r1.ebuild 532 BLAKE2B f044b1a6322972311903a46f544c7306a88de556216e4218d1c8980770aecb9b51fecf9125fcb747562ee64cf825633fcd87bcfc3c8a47e8b817691e5fc09a8b SHA512 ec927a3112411c7d089d924ea65d4eeef0496a837232339b996aec21a3fb271e818675fd9c99cff7110aa436fcc2e720a55bc9708c178cd828ab07ac2dd14114
EBUILD pytest-aiohttp-0.3.0.ebuild 608 BLAKE2B 15c3fe584a822ae28da6b01f91dbeb89b9fb7e2691164d585c4072128671289dfedce1b9e4dadad83342a18c7e2ce89ff4effc77e525d9ef862fb5109299974b SHA512 40409add5aacf9f266d658cff98be13321e4540f0dd5f367f9f61db4ea6078c8b834e6e1d024ee85d90d94afff48a7d071a5e4759d0451fd40690a2c16a20ea0
MISC metadata.xml 358 BLAKE2B 8d7d3a4d56967f16b3c8b5facccb0af056201daf975aeaa8cb9b651db735183cb38e35d1a86037306d6c61971690b7093ac8bf0c4197b2ce6228d0323c15ed0d SHA512 4f7db25811be35ac9976bf5707b0ee0927dae9f00d8be85f18eb165708f08ec7c4bb7ebfc4ca021a6432eab8ab25785c8b27959df8ff9dfc2a969b588de68829
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
index beda1c97ad55..f0fc3c7317b0 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 18ab52f968fc..2ea5099f8c58 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -5,6 +5,6 @@ DIST pytest-asyncio-0.12.0.tar.gz 14294 BLAKE2B f62bb025bd3e35b5b4571b232ae2dabe
DIST pytest-asyncio-0.14.0.tar.gz 14796 BLAKE2B 0a110dabde491293dc10452239971809ec6a4006a2036e848aac067df1af328d0d1d5c7afae8cfc1ecf5c919c0922050e2db182065500ec614a8094d3799c0cd SHA512 d1fadff152a0c94f80a8272a0dd293bd9d9300ad9e79c69556b5901c1a8ce00545f7715e503a383e3f4f35c8090d8f9ec33d16739b85378b59b1786a50441fca
EBUILD pytest-asyncio-0.10.0.ebuild 833 BLAKE2B 7474a3709b045c8ba57623907eeb2fec75edff8f09d27be3ce9957c7dfc31836655ff2020a6c287a877df6705e9c11805bc33a870e8d407e076b3479f7cc6f48 SHA512 0211e34d00b6761465d543920a5341f5043317cc4d86a94401606647013efc3be81ea83e4d75ba9e1ef51f70ce00f26b8a590cc1d7635c4be7f24fd78a3fc3e5
EBUILD pytest-asyncio-0.11.0.ebuild 762 BLAKE2B d55984ddaacc624f1f96457811448e4d3d9af28d8ab9ee5610b0def42beca68b2c6294afec80f55324451a623e3ed40151fac52f662eb35eaccb2bea22358763 SHA512 66f3e6661bf185adae6304480f4f5fec32ea0c8ea75177f8ce9111e00f87e7d8fc4b5bde230e7dfa3fe9899140d1ede0d4a1b42bf35dac5c8b8ba3dd887e8cb1
-EBUILD pytest-asyncio-0.12.0.ebuild 816 BLAKE2B a39d5df1cca40426e0c8d65eebb86d3720b530ddb51f365837575f311f26bb2253b5ff930762c26db4dbfe6909e0e7f56c831d28392e3b17a76fb47324fd8106 SHA512 63ba162d11959ef59261923d376f863ff5eada602eeb24c5ca9a6e8a3ebaf73e0eb541c489bd133ddb5b2e80d70fcb71a68ba4ccd9ca18795d04569ab6609d43
+EBUILD pytest-asyncio-0.12.0.ebuild 815 BLAKE2B 66feb82a60f159375d572937754944b8b7c7b7e90a514538c40afdf4293ecb8e08d4dbc8ef3530ded0af8fe29d3c9fa406ee6f0ed7ac7270c53f46a949606be1 SHA512 e1c9809e69ec5cca51c825dd28cf0bbbf44a0841051f4c4c270811a7703a3c577f5c645a84e60e26fdd7bf9e91a04f60cfc7bc711ce55e22bffd2a71f68c3035
EBUILD pytest-asyncio-0.14.0.ebuild 816 BLAKE2B a39d5df1cca40426e0c8d65eebb86d3720b530ddb51f365837575f311f26bb2253b5ff930762c26db4dbfe6909e0e7f56c831d28392e3b17a76fb47324fd8106 SHA512 63ba162d11959ef59261923d376f863ff5eada602eeb24c5ca9a6e8a3ebaf73e0eb541c489bd133ddb5b2e80d70fcb71a68ba4ccd9ca18795d04569ab6609d43
MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
index 64dfa2878e8f..ac428024c56c 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> $
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
RDEPEND="
>=dev-python/pytest-5.4.0"
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index 3d7ba0ccc6e2..39af20d38312 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,5 +1,5 @@
DIST pytest-django-3.8.0.tar.gz 70013 BLAKE2B 75e2ebf6a3a61cfabdc59ceb6f60a85ab4e257b22e3ff55bcda122a370317bf91a9f90640d9edc17da2cc3bdc6dcf6e84dd1e3438dff91b07f5682713804d513 SHA512 3ce45b08f913c3e20b679c7f7a07818ffab7088fd90757794e1807db2025d655c195304da3ca3905c8ddb58fc9708000dc492f4114df8f4e7bfdb1285ebd997a
DIST pytest-django-3.9.0.tar.gz 70498 BLAKE2B 0f3cf7ffd528f00dd0c7dd6babcb64833ec3684c7b62dcb8757b0f90cdcdddabffdbff240774ed6fb2a294e27da2acd7f396298ff2884be6e5b4c8d9c632d008 SHA512 92985e66f47c91363d19fe2bfe8ccab14212be577692f90923dbbae4c8d406cf698796d485af2b721863392810fc07c6f11ada0c61589cd1861f0d34a732effe
EBUILD pytest-django-3.8.0.ebuild 727 BLAKE2B e3cb064747983e53a3e9245a2cbc872f3ba1545b89047a81143bd103407ea8d942b7fe0423b3038216eb42e591302bf360570be407be1edcf78a8c20aaff58e7 SHA512 da6f7f1481b82c9380485c595ac74baa46dace9b059e5fc56abaa9924b08c87e9debddc50e7c2cac532c0b06ffa19d5ce5b8ae5ebf55850a8a5f3240f33ea702
-EBUILD pytest-django-3.9.0.ebuild 729 BLAKE2B 952250a3344800163d4a695e2d926341643a414fd9fa845571dfb4facdfbbc74124ce80a2d32e439d6c60609da0d627db22473accdeb5cfde11ddaa423e46029 SHA512 496fa81c41038cf9234271fd5e6124c1c431ab9ae6b7d1c8c05a86833bb827dccfea69375cddc79f942177a3c834745eea4ca54821d744084cfdc6179ca0fbae
+EBUILD pytest-django-3.9.0.ebuild 728 BLAKE2B b192094e7784fa337ec384ea467f3d38b855ffda7be61af65387f342cf2cfe19577bef7753d2d98e72209e3050be2af3e1864fd6d6416a0927ee6a41ae46bc21 SHA512 4e69d3380fc15fa0f26b34842b394f717f4f5affd21bea3a83f4579a8146c36ab2872fd61a33cc64456ccdcc6c7f9a16102a9c4e062be626a4451f4e1a844caf
MISC metadata.xml 380 BLAKE2B 6d349594a1198f6cbf2c6e0e80276f3d27454346cdbd24654506221647304fc3d3a0c9b8deadb920c4881b62c779951df2cda6a773f4f251c7c31d166fdf7b2c SHA512 65163d6f99c4d2be86bbedad07b756eda2aa639cd612e0ffaf95dc0707e72de8b406ad51d2a482925790c837bc7c3d4ccd5dc3fd070da6599e13278db03ab006
diff --git a/dev-python/pytest-django/pytest-django-3.9.0.ebuild b/dev-python/pytest-django/pytest-django-3.9.0.ebuild
index d8944a9de33a..9c4a38beff7d 100644
--- a/dev-python/pytest-django/pytest-django-3.9.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-3.9.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pypi.org/project/pytest-django/ https://pytest-django.readthed
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
SLOT="0"
RDEPEND="
diff --git a/dev-python/pytest-freezegun/Manifest b/dev-python/pytest-freezegun/Manifest
new file mode 100644
index 000000000000..06bc02f880bb
--- /dev/null
+++ b/dev-python/pytest-freezegun/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-freezegun-0.4.1.gh.tar.gz 6809 BLAKE2B 258fcc5976c50dbc923ebbf7ba552b2ff2a058e5864f9b2c4a1339e585e0e245ba2346ff65a284fed71fec388a48dbf66e81a752d3b53b65897f3a687e05ed92 SHA512 42cebf13538e9a8aa992555e086886210dfb40b95fd8a4bb8bb79c5968e08aafa1979ff3cb28425993b71f5df91d77012946e36f14ad512a9d3d856eddb5fe3e
+EBUILD pytest-freezegun-0.4.1.ebuild 680 BLAKE2B ebca50cce73556d8ee9856c4ed019dc8d134eef67bd9eaadbe1daa56a8944d87df42e7930cb91aa0864d4ebe42d05486299f14078a0a890d836ea67ce84b0cfe SHA512 c6457722217c413f9d41cf08d1f9504cead4817d567bee0bd23486d553fbadee41c7cbf26488e06d4a7b719a0c3f3469a5fef8deb6f4618d8ed947f439cd8f90
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pytest-freezegun/metadata.xml b/dev-python/pytest-freezegun/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/pytest-freezegun/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ python@gentoo.org
+
+
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.1.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.1.ebuild
new file mode 100644
index 000000000000..77e9e8b80533
--- /dev/null
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Easily freeze time in pytest test + fixtures"
+HOMEPAGE="https://github.com/ktosiek/pytest-freezegun"
+SRC_URI="
+ https://github.com/ktosiek/pytest-freezegun/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+
+RDEPEND="
+ dev-python/freezegun[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+ distutils_install_for_testing
+ pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index c1a8cf0ad4a0..67db092ecf82 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,4 +1,4 @@
DIST pytest-localserver-0.5.0.tar.gz 20409 BLAKE2B 62376065ee1aeb698ea5e3bd2d5ea3d6b511cc6793142aad458423513b0e3b358a0d0269a78a0f5aeda44fc53757ff85da786627840ee48cbed8b78ee34c2227 SHA512 aedf1e1c9563396457070df13df228ad0ebdd19173fa2ac5a598288d3e1a1ac8b8a0c0288cba0d8478e43d2e1de4848f2393bf640705916957f12ab31171c6cc
-EBUILD pytest-localserver-0.5.0-r1.ebuild 716 BLAKE2B 0e6635efd6ebd7b961a5fb69a8cbceb79fd2f24b951a89a8afbe222b8b2f835be0ee4cdbf46c982c60af595f59457e516390a7f94a7fa28306ed1076a4be407a SHA512 d75d5c52f5693fc7f583a2757f78aa40470f0ced3cba0df2ae8714fc79c663eaa7a8b0e974bca3c116db874ed3a7594de4178d3c2c900cbca2a26f622a2f8ff3
+EBUILD pytest-localserver-0.5.0-r1.ebuild 713 BLAKE2B 391de9b63620d9a0eff2b51d9e3b58848978a84dc8a03bc4793a64e0e7942cd232501a4319d824fffe6da83498f726037848164ae7eca813d31af0a555b8ad7b SHA512 2a000f78ef3a2c6af2fbe6dc0c092277e611e77be0ea4dd8a0c52fa7ab8db5215e36f4b7e7faf18fee70ea6c05568788f6e1fd4f99c19c46b941199069dd8ec4
EBUILD pytest-localserver-0.5.0.ebuild 716 BLAKE2B 050e0d2fdfd611b220e3b5d24c19767194bbea170b129f7fdccea7e42d8d419cecf003ad1ef59f28e3d588828ef94a306d0f1ef5f9ce07607bac92981ec70f63 SHA512 480f91c21e558f87d52bc9626c1f7b3209696cc8c672cd38b3f8cbf8cbf49a4542947e8da099bdd8c02dc76b5cb678a66285d87d5dbe7183c887b13c1265bee7
MISC metadata.xml 321 BLAKE2B 1965ab8ae78a55b07a92b65e39549bee5e4136a133deaf3c510aa52005dd7e97a030ec30779a8d9223048b90c9146513f761d61b30b78e5f772e2ae4b98f1609 SHA512 db2e0fe334587804689d91759326ad5dabf3aad411c9046943562273f89485b1524b0f62173c9bda2daaaab2e0d09309d23896e91b3e2716e36472c87bf5f883
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild
index bccd1638b901..d0574f22ec59 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
BDEPEND="
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 511447ebb7a3..bc705dd18b5a 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,6 +1,6 @@
DIST pytest-shutil-1.2.11.tar.gz 18310 BLAKE2B a85f50a8a0e98de6dd71af0b27f76181b1ff80b518877155122998c3f8992c2749ebcc837d630dc19d60d988410eba8dc77b1be7faff7cf27003ebbba9194bcc SHA512 2a998218bb997a6ceb277965e2f150b2d7722ba518f579154f804568f552e2c41ced9a491c1745382dc119d0b92f3ea993ae77a61851809aae59a1e17501bde8
DIST pytest-shutil-1.7.0.tar.gz 23497 BLAKE2B e13641491fb4bd448973b8004ac9ded2f9b7c412ea93af7f9206e5fc38ea7554073374116eeefc529d2ae35e8a25e678fef5a27089af89026077a72d11d6016d SHA512 3746c08b17834621a7142ed9d5915b5c348c13367f5b423b258d3471bcb9c9e983c61c25ca936f879b8b82f80512512b7f3ade5555c24a790c72b502e3f3d144
EBUILD pytest-shutil-1.2.11.ebuild 1046 BLAKE2B 13bc77397a8c9c3b90d8c170d151f5f92cef32e60c5ee814351d29baa3098ece9e84a345c417bf9719efa10e975bb2038e8d02fc36fc70aa952912e64ffc7ace SHA512 fc3eba98d9e9e770944baf8e06c4f3927973727a7989313b927785bb6b7a73ac35e1792ebd4a62f3a652a1e373410dec1ea608c8df92173dc0716104f6b269f5
-EBUILD pytest-shutil-1.7.0-r1.ebuild 1473 BLAKE2B 2cf57d7ff7e038578fb8a82f4fcc6474b5456dc8fd3a70c8781b46befcdc1daa9d9715a97bd1e949b6a71d7c3b338a0ae32d71189ee674a1a8861c777cafaf41 SHA512 8caf7ca31564b1047cd66a0a2e7b1cc446657d8445595da41a6f4b3a9fe56b197eb4ef31199224309e4ecdfffadd0933047f5a717f706826fa24114e4b5f113d
+EBUILD pytest-shutil-1.7.0-r1.ebuild 1468 BLAKE2B bc20d8a2fffb3a1c249febeaa0be72931b7d55c20a2095ea90388d73697679a43a386c2f33e90a9c70c2464de69bc7dc6b3447e96c5a4542237c4fa2f27ef4bb SHA512 67632c62bcac11b330528e0afd8bbeac1c89c003c1b316b3c21bfdf742ad2893604adeb1c5226cd98eccdc24ee3fd4d624a50d7c348d6d6b7547c5c4ce05f30d
EBUILD pytest-shutil-1.7.0.ebuild 1330 BLAKE2B babeec95dc8d91392e65469992aad6b5902582f2a7e585978f0fadc7440b69955efee154ff86317cdc32808ad004e6c050252607824e855d14056ff461672534 SHA512 6bbe1c16c9ba9bf1c93c2bb39118d4e4a865985a2bc466515ac3755d95839d7b34ff2fea80239d34f735287ceb30e9e0935cfc2208d7501f80b2c550d703e5e2
MISC metadata.xml 708 BLAKE2B b8d9f61638c355a67e3f59b91a61190f334a8cb38e16cec988b54cced0028a4b7d730575eed93a0f562b3d86a4e5610fc750734746b7f86ad685e957703c4121 SHA512 ae58ff809ae82cde03544ccabbff1e866dedaa777afa74ff50d757babd8d95da0f7448e15b53f7754c182b8dc62e17e0fa8bfdc2e6664c8b6c2481b77d59ab48
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
index 668d150c5535..dcafa45325e0 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index 6a6143854b1e..bd752f00216f 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -4,7 +4,7 @@ DIST pytest-timeout-1.3.4.tar.gz 12255 BLAKE2B c8991e0255a490048f43e1163d0315cb8
DIST pytest-timeout-1.4.0.tar.gz 13661 BLAKE2B d55cf85e44da1e8216d28d08c6783e720a37dbc4bed58c82a24918ac471e8d66f33967f16a249aa5307d0e227082e5628c06041b1bbd12e251a97449c69e5cb5 SHA512 457e30c0746e2762f4a62b0cdbad4f7ca4514175d97daa97fdbb1ebab8743085e828336f137a9cc7dc655c0827c038177195b589ed531d81bb911b6e5e5c875d
DIST pytest-timeout-1.4.1.tar.gz 13804 BLAKE2B 45e9bdf6eb39e706cac2c9484cd34a9f16096d71d0146251bef9591c35c269043c95e641bed40b25e3d2076fe29a5782363bf9130b331eb04c4e867b1e8f646b SHA512 b62b090365c1cfe1a4d544b5645f828e451ec5229313c50a26ce04ba6cb203ff9ab487c61fb000af342f3d499e11f67aff5f84ff5b00328a129f1f39d4aabf28
EBUILD pytest-timeout-1.3.3.ebuild 741 BLAKE2B e3408a045aa7dfcb9e3e752c413a257cb57c9f3e7f4d2b12ac120ce0fee057e0f481ed09b83bac86a005587a96e4140305af98b95048ac3292bb3c42c238d4fb SHA512 7d589a28ee3ed5b286ad0fd4d0e1eac46f1236631f69c868576f182f6281475243981c31a828d1190605bdee5a5c25143e31f42f8c4daee810ed1594b187c275
-EBUILD pytest-timeout-1.3.4.ebuild 760 BLAKE2B 1d66d2e4880ba14a840f920e0b36d4d2ebdbfe4a06b70eb4d57746c522674499704c1b201d0a8e8e49a1cc1090c19d155ccd1ffc887793e06926f23e07b28df9 SHA512 5b273c35f9bb2a9999c0b6a951d4ce31cc21a3a6218a89c4d6e7bfca0cbfa3603ac42e9910ddd3819f136ebb73b5492fb398dfee4be554335e3a23982085ee4d
+EBUILD pytest-timeout-1.3.4.ebuild 756 BLAKE2B a6bd45c1832a2a5d7be9c1655f7f96c1b1ea3a28b52fb935cd9555719de49ad9cc1b19475c46c86e05bf85aaf028504c51b6a1f50f7f793c52b3acdc4e49db51 SHA512 e0f4d8d4d06b279fe02eff35ddabc210712db7d5d410305be9006fdf4eacbf1221eee241570f450ad59cadb9d56c46c2a087603b7db2196680f0bebbfe4fc6bd
EBUILD pytest-timeout-1.4.0.ebuild 760 BLAKE2B 1d66d2e4880ba14a840f920e0b36d4d2ebdbfe4a06b70eb4d57746c522674499704c1b201d0a8e8e49a1cc1090c19d155ccd1ffc887793e06926f23e07b28df9 SHA512 5b273c35f9bb2a9999c0b6a951d4ce31cc21a3a6218a89c4d6e7bfca0cbfa3603ac42e9910ddd3819f136ebb73b5492fb398dfee4be554335e3a23982085ee4d
-EBUILD pytest-timeout-1.4.1.ebuild 842 BLAKE2B 89f6b0a532534d54dab1fd9b6e51fafc7ddc4774f44d2c10d2f830a1dd9b68f37b77c8663f955be6e719491f1cc7aa79eb9c782a89cf91a22a337381e838577c SHA512 213ddf28bdf2b7fbe831ea17c1f2e0b1f397f35acc7c95085d2e58058318d92cb6c03cba18bd67cc77ef4bef96f5568d1104b4fca7f705ac5adc14b012fff0f9
+EBUILD pytest-timeout-1.4.1-r1.ebuild 838 BLAKE2B 9b9e4d996627e0e98d20dd9a2d9aad09aaa2998ddfe3237ac05dbcc79df982c9bf98b31f001a136c37dc6ed3d79ba34b736885dd03cc13edb932a3cdbf6f01a6 SHA512 f98cb57629c3d6a4c96cd960ab100a7799f5dc52dc8a486d4df1b43f5ebe57a8401d45f79543dfbf674f9018d7ac55d7910f05a4293bd099d0cc53bb875ca0af
MISC metadata.xml 327 BLAKE2B 23dc2e5e6f023223ab4774206b2d94fd27fc0a6b2592c8e0c317e1c1a0e7c26ed4f8e23187c5499b7fc9c4acc0df601a056ab1dced8115a47a9e72697037fa32 SHA512 6040289d134f65896f2fb80538d9caa4ce628911c5ed21568a30087d1b0ffb14b9acbf874956720b1d9c56290c78bb965ac9299bc400fd89a258f3627180780a
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.3.4.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.3.4.ebuild
index 7b3e50afe479..64babfd23018 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.3.4.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..516df2f00d54
--- /dev/null
+++ b/dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin to abort hanging tests"
+HOMEPAGE="https://pypi.org/project/pytest-timeout/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# do not rdepend on pytest, it won't be used without it anyway
+# pytest-cov used to test compatibility
+BDEPEND="
+ test? (
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ dev-python/pytest-cov[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests pytest
+
+python_test() {
+ distutils_install_for_testing
+
+ pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.1.ebuild
deleted file mode 100644
index acb582e46efc..000000000000
--- a/dev-python/pytest-timeout/pytest-timeout-1.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin to abort hanging tests"
-HOMEPAGE="https://pypi.org/project/pytest-timeout/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-# pytest-cov used to test compatibility
-BDEPEND="
- test? (
- ${RDEPEND}
- dev-python/pexpect[${PYTHON_USEDEP}]
- dev-python/pytest-cov[${PYTHON_USEDEP}]
- )"
-
-python_test() {
- distutils_install_for_testing
-
- pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index fdffc20ac54a..ac7a3988dae4 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -4,8 +4,10 @@ DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f79184
DIST pytest-xdist-1.28.0.tar.gz 61486 BLAKE2B ef8157079ea890342cd566f327588148fa898a3404e3edcffb60ba8ba37d9473b4c2a47fc737f7bb074042c6aadd737ac51f348ce79a718eb446036016cd5e23 SHA512 89b8885103a944ae72535de40028db052f76631ade6f969489d3dc3a1a61a3233df6655d0905d9f5253f23740a15aea824b460c680e79c16f275b31cb2abd6ad
DIST pytest-xdist-1.31.0.tar.gz 66133 BLAKE2B 79fe5f3bcad3421c1c751ffe6e09f0da42d4ff7c0016cb421ffabcab167028ec41ccfb02bbb275564cd74b13ade8d6e79bbb70b34995f3bc9000604a1533df9a SHA512 b7960d20295232b251c8ddcc5a3b9d6e7b761d577ba11c2647b4b4b410ee5c05998cf57fa57208561eb3ea7c4914db1fd446173794589d8c8e8e79ff8e0ad3aa
DIST pytest-xdist-1.32.0.tar.gz 67733 BLAKE2B da0ce4e43dc8752e4329ddcbc13a5f55f5bc120c13f39bb01916770d2dc1864197fd91f92bc55ba27cd74b0d837ac2d310980874cdf54761339b2cd654dd6e74 SHA512 f159b4653efb4afeff4124df484670d3c672e1014712f948390b25efc53096f8237258c83a5f1a9e688c52b4a756291cb731d37fdfa800707f556550a19cb0e8
+DIST pytest-xdist-1.33.0.tar.gz 65588 BLAKE2B 096ffa9295ec0ef4d390b714b02a4d126aa33475b55591b91375f2da0c957802e007b990dc2051d5198f223b250a4a7294367c9da8f8969313a61a7e8ef18ebd SHA512 5e5b23e60b546779d4bbcc9b86c004bdb084689ba006c8bb8a7db9be60b6080f04a5bb2b1f5b43a5062b82e35493331d1da699d8a36177307280b06aa23a1367
EBUILD pytest-xdist-1.23.2.ebuild 1038 BLAKE2B 1d3b0a9b09b92c4ca54420f8c080a84c975e070e8195243659bde9dd4de01641fbd702ac00b059edd90c430e503b976a8e228457d630dae827298c2b8cc6bbd1 SHA512 c49f37f82f8167652b5a354be76e05be6b6cf378af707ae5a3ff1b1bdd0ed6366c682f09062118443264324faa4eafa3b7f131668eb9180a8708cfd25d92f546
EBUILD pytest-xdist-1.28.0.ebuild 992 BLAKE2B 1e550a1cb605b0d0df688f89271ea05ceddcd33b8079fe9dfe239cfe66d7c856cc45f81237bca814ad1c44e605b2f111b7fd2e45ed80b5e4a95335ece97b3b90 SHA512 0b894d560dbdfa1deb8f8580d21958af57b1f2107caae0849353202ec622d5c0ab0055f803357c9c11169edf7e85e1914546e0f7e4b82c1d11d5ea1666aee3f4
EBUILD pytest-xdist-1.31.0.ebuild 951 BLAKE2B f19b0849f99675e4f6b151f5bc2d7364d10f399e7bd14f0200592ba8e1a75ec91a7cd74632140c3ad1f490b32af940bcf6963d4f9aca0b0521075eb050edefb0 SHA512 cd6524fcd8d023928e6d64f8d89828158841463f5fdf528905b88a2aa022609a33553d3721792939bcfcc8e85eb3b281637bc4f494b262229d1b2e092cdd4e50
-EBUILD pytest-xdist-1.32.0.ebuild 1028 BLAKE2B b097cb41d9f2cbb02f85e128b139a93410ad87ebe1712677b9e9578733c4d4a7230ef443f82089df972fe0a98383e4c3fb131f59f74021c6ffd95d9a79123c88 SHA512 e1bc7e10673f5bb8904186bc4893187e12c8a20dd5b06bc4b0b61cb8dcd43ee804912a1b41dd03239b52f3ac3fc110e14b87e97824e72013a62eb90758e20913
+EBUILD pytest-xdist-1.32.0.ebuild 1023 BLAKE2B 63f0cebe014647122d3466118b14716e92b63ad45f2b70e4b4290ca0fab9d7e9c3d5155fd5e30961741c7737b4e0d2befe53075675b1b553007c7b5ccddcdda7 SHA512 b8a3e64cdb6b9ae4cab12cb42af053d2cedc8657150abc0eb0a62d54637fc6ab6e57733d11ad1bb2d09e843cbdffd10bea20dfb7770f2b0f3c0a8814b6781257
+EBUILD pytest-xdist-1.33.0.ebuild 1058 BLAKE2B c4986b9371cf6ad58882e08f0da5e6abddd6943b03d72e4fb96be5bb9d0ac77adb64a3b4087e5c46cb15c7574230bc490a57b332dc2acc473401ed2b491bff8c SHA512 860cfcf2b2238e60934628ea4fcb721f06fd1dbefebf9b8fe6c10ad1aba71b6e9d8ae0b337bfc547f50e2f86bd5bf56afe905fff43f99a8b8c2228e7b31eee72
MISC metadata.xml 453 BLAKE2B 9480ffb520fafac8b32ec407fb065a89b67c085c7474032528e6a7489fdb26d288228cb75a502e407d92f0e53283bda58c2632e552d4daf65d37b78d33b3598b SHA512 13ec72148a023c16de4b51f02f8a34f5a29ba26bae56aebd8a89ca7a90f249126f92096d138d41d770eb1053618e58679211f468e3136f594514a936f414b265
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.32.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.32.0.ebuild
index 8ff5690847c6..eaf278c97d40 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.32.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.32.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.33.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.33.0.ebuild
new file mode 100644
index 000000000000..3ddf4d064b5b
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-1.33.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pleaes do not depend on pytest to avoid unnecessary USEDEP enforcement
+RDEPEND="
+ dev-python/execnet[${PYTHON_USEDEP}]
+ dev-python/pytest-forked[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/filelock[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/pytest-xdist-1.32.0-timeout.patch
+)
+
+python_test() {
+ distutils_install_for_testing
+ pytest -vv testing || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 2b04e335e084..35cb609974e9 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -15,5 +15,5 @@ EBUILD pytest-4.6.11.ebuild 2479 BLAKE2B e37239c985098812b074113b3ea888dfa75ef67
EBUILD pytest-4.6.9.ebuild 2436 BLAKE2B f4bdbba1e7731e8dbfe4294acd1fc9e72d498bdb13c9cfa57c17da5f9d3aa0089caff3e32b6d68b5b66f4b48bd50f4d9310eeedb8502c50fff189ed2edc8c8bc SHA512 b4ead0e0d0d88175ee79b11af0f7e94790e0d82931defd425c71e138fec6008e6d244fa311e86549e11cc5a02c8a3df8ee9f55565a42f26855021c64f3561059
EBUILD pytest-5.4.1.ebuild 1641 BLAKE2B 7e4fbe80e3ad011c67d7260bdef6044d5aa852bce7f4ebee0553c3699919ec69fe9da867cd000041b2cdca7443607c3adaf550e4ee5031cb339541bc56fe1b65 SHA512 c9c0eb717a245e038900b63f8db6929045686cc43df3aef51cd0d134f9e9840b05896ce5f926625eefcadaf336dca0ff7252c9143370e1e4962e3e87717f5f42
EBUILD pytest-5.4.2.ebuild 1936 BLAKE2B 195e537e81b333b4b46165a6094db2ff387e11d04aa62902fb0e35951a14b5e656b5b610c7ab1b28e210c197246d51d3e5f3642b47429be9053eb7731ba27f3f SHA512 77fc2743ebe5620f3fdf4bb5338b7eaae137ff1c2d4d651c1b60a7632129ff4554185ccd9456f1429bbce779a05bf9daa9ed5f144db94c73ba8960b55ac4fe88
-EBUILD pytest-5.4.3.ebuild 1942 BLAKE2B c916fc49800604c6f732dd9ab8a3931da2c9f4a37e7095bec502fee038c8bb69c3486ceebeffa72f4824f0ae08c6aba7329367ced5e1615ccdfc30f61f45585b SHA512 93ca726ac64abb5dcea47f64b725c2d42b36c18eb0968224bc359ab725ce27f250ba7d69853cb09e36d2df149b191d03c1322e46722e9f666d9237647e776f50
+EBUILD pytest-5.4.3.ebuild 1939 BLAKE2B 65316a97fbc8b8e9214eb92f506b7573a39ceff4460b7d484c610766aa68e2d6a6c6453f1219eda1d5fc63f6035f060a90edcdc9d9114bb8544d1742b8169171 SHA512 17cb8d37cf3619b8536cda3a331081ad7e58f51adba357d357f9364e248d4fcacfefadeae396bc8c71fdccdd73f37d5b491f83558e7a3903db88a7bcdf6e3626
MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-5.4.3.ebuild b/dev-python/pytest/pytest-5.4.3.ebuild
index 3453fa72eca5..4c72e2791f5e 100644
--- a/dev-python/pytest/pytest-5.4.3.ebuild
+++ b/dev-python/pytest/pytest-5.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/python-augeas/Manifest b/dev-python/python-augeas/Manifest
index cb4c52d78ec2..f3809d8c30dd 100644
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@@ -4,5 +4,5 @@ DIST python-augeas-1.0.3.tar.gz 92747 BLAKE2B 0dda6ae6bbac1689c633301b91877cca4c
DIST python-augeas-1.1.0.tar.gz 93657 BLAKE2B 21d2713d8e11552cc7f0191d2b8f7805b223f5dc9478b89b39dcbd325ab354cef0bfc0314852dc2b071b3b061319b4e27904c0514eb6d6ffd4e39cf7ca33d1f9 SHA512 34e4e98219b9146ef843d94c2e854e951a9b7e81409e603e77e7defdbb8765c013a2c869a4f5db2244352ca35656e18667a0210dd24099cb3e4552a04b23aef8
EBUILD python-augeas-0.5.0.ebuild 502 BLAKE2B 2e83dc4cab811049499fba53ec94ebf26c360caf91f38465f804fb6cd27a34f71ccc60f2b1e21e6749adf25532e65c3291147d80f4ef61be28c859aee71c58df SHA512 7651b65a3a002900d785127d4b500f4f42e0b88d06949734ecc4e0c59fb7542e3b5c2f85d4ceaf790c0d9030dad08230ec62aad0a569e5f201aff5b6fcdff3df
EBUILD python-augeas-1.0.3.ebuild 549 BLAKE2B 5b6189382e0195e634eecce3e53fec7eb60e0b94b5be1e9cae057be9b193bcd7d232d2aeea9ee960500baecc1ff96460938d696f9fbd03b0bb73080e9ebdc636 SHA512 5aa0c2d9ac17cd6a76f0651e067926418121d1b0cd26cc5047a99a02fd567c972c3b52920be765f8c0c3c7bbdfca35a75676b93bc69a0044fa2b6a594c2bba56
-EBUILD python-augeas-1.1.0.ebuild 599 BLAKE2B 98e32c8943f7871414def4256f923ffbe73d48b6f67a6709a07e001cd268d0e44d0c62dfc48df0b19f42cc96c2742fe31b782ad41c8ec70be16d4d6a5f21172b SHA512 c975d60e0d3b6de3de729f853e506cb16e3e868906421560465a697f395d0194b2dbaf35cc5cd453bdce360a2a59df5c408e79ac6818cee1f0b4878e042b4d13
+EBUILD python-augeas-1.1.0.ebuild 598 BLAKE2B 1bc329610a723d24dea4e55252202feb7badbdf8e0e5cfe72f62749c3672febc4ec57fa8b6e9d2c9e312c6dae427df85b5b0fdabc8074d7c5c698fd6e4c8f847 SHA512 27e7fa3b81fa7c710942924c17f3ba42683730ca80ab63407ee128b345a94ecc090111081af014c8aaa5d88116893651b0351d65f38db45a68507575eb3664f8
MISC metadata.xml 378 BLAKE2B 730a72f0b71dda3f088896f90b941d3e2999248d58f17901e736f05c510e62bc5a7f4e2060b2d379d2e5d74e81856c7d85272f9e106c873ac0fce636c956fcec SHA512 0f3de67946ac3aa2cb80adbc39b42e4ee92d4a8f9886048d77d14ce6aa9c47e15cedcceae9e70ba07261407cb2e3906f05633006ed038062a9ad10d341701267
diff --git a/dev-python/python-augeas/python-augeas-1.1.0.ebuild b/dev-python/python-augeas/python-augeas-1.1.0.ebuild
index 42d631372089..693ca962cd77 100644
--- a/dev-python/python-augeas/python-augeas-1.1.0.ebuild
+++ b/dev-python/python-augeas/python-augeas-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
RDEPEND="app-admin/augeas
>=dev-python/cffi-1.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 7e0479406c68..311a08ca98fd 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -1,11 +1,17 @@
DIST python-2.7.17-docs-html.tar.bz2 4605137 BLAKE2B 40d67a1443fd8df792e6721354efd62116352980e9353f7d334d4f8f1fba64ed7fd87b011cf1ebf47822607bb0ae970d47246bb83370cc922a51a85fd433357e SHA512 e0f1b2c75297dfb7b0b8913423db0d6ee9fde171b346831244fae5a783c2f834ef49dd137d835d4f052bb65a5962e051835b298271ad679dcf19b1d9118d968b
+DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709641e0844c42e924262d6ee21a55e515aaf4d023bf394681bab780ab83998de9f409685e2d5870506810432145acc6422eff9d SHA512 db39390577ec86f13c9b6b57c01cba36fe9fd89092a773dc94f1a6a19d912759d097c4d80e765d3657b572abc731c1da9e7b4cd4c38065cd444606b906744abe
DIST python-3.6.10-docs-html.tar.bz2 5994263 BLAKE2B 5491942b7b19af3a880dabd146cdc5c1fdab583eab8cec38554c92afc824dd8d011553cfad957fb68abcea102f41436f25a716a28356ed7f18e6f70337d2734b SHA512 67a0e7973da0314031d9a8993cef4947b8bcab86c2c557364a3acebcc9047529acf22a26f16a26d3126489bc813d6bb7bf39d3e283c490bad434f215af92f754
-DIST python-3.7.6-docs-html.tar.bz2 6248802 BLAKE2B b2baff27bf3fc61ebe521b5bf621c265a50336d63ec8c2e14f8f2fa75b552fa4f959b3448ed39ebf18bece46cdc14f8a7a62cae3fcdd4f44e3db09489807bf4f SHA512 52657627dfe088184afbc0827731cf919884f21ae483c934a84e1e93bd1b03fe7b948da8ea8dfc1ba80e0557504d14eab729d22b7230000ba34731e1b866a253
+DIST python-3.6.11-docs-html.tar.bz2 6012332 BLAKE2B 9daa262be400912c82382dd8e878dd2a21430e99f15bec50386c421a2cc1be44f827cceb37c45c819ab849db5a44372d9b1f508fed1c8c4e884558cbd97ff8c6 SHA512 e98745e0f27c466f93d1d0a8883d9285c56c7b7a27915bc2fcc71f44cb10feebcaa5d3e07b8fce478cf64f11b0863182a1df25307ee383bcf0db0b6cd518035d
DIST python-3.7.7-docs-html.tar.bz2 6259882 BLAKE2B 5ff9dbbf0941385453283a47df2bc7ee085c3c8dd0c2fc0f2b98af766ec31b1f1d1c04586a26f978287ff575641c1710b373a0093fe1b928cd73362e7e30630c SHA512 5a556a0c8dd739c16d7b6105e11ef62adaa939bd784d4f5fa0df26555c7d1908c09626c091dc0bf2d892624274646573c9fde5a5b218adf770bcf7c097976a06
+DIST python-3.7.8-docs-html.tar.bz2 6283763 BLAKE2B 617feba1f9a751fe98f124e572339cbad96abccc0c0c00339331edf52596f47dc73c13b8fcfae4343ea5515ecbf59c697b0611358ff3788e380695b2bb9e5a20 SHA512 8aaf57b0a539d98a7158ffeed03b4c631ca45e34bfc9000547b4372ecd397e79a652f297674d3af631c696d80272aedec3930f4a01b584e17c3e41e9f933e16c
DIST python-3.8.2-docs-html.tar.bz2 6536475 BLAKE2B f807caa25596aebd8fb441366f7986db0525b9262da906700f167b997795035daa1fe80b8b5ffdfb6c4fa9b552fd55c8546af110e3686a19c855966c58170b4a SHA512 1453770abba67b147a9a8911de3f31972beeea3b7249b1009944635e30e8b4143f1ceaee447dc9f14d85bd09bc67671b922e3e931b8e1279b46ab10ab5c91091
+DIST python-3.8.3-docs-html.tar.bz2 6556303 BLAKE2B aa5d29680dc274af33346b2651ae0d0a820eaa38b2571d210991a35f0db35b2fd155ff57cfbf9ab1cdace129ac6c3acb0abf40787c79987788c14fe4f8891a98 SHA512 5aad0ec599ac4ee478baac91c0ac38d7ac44bb8979bac9263aaafb515103420e0bb8ca4a20b8b915661d1804fc0ad02aa9cfbf00d60a5184df27b0a082109614
EBUILD python-docs-2.7.17.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
+EBUILD python-docs-2.7.18.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
EBUILD python-docs-3.6.10.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
-EBUILD python-docs-3.7.6.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
+EBUILD python-docs-3.6.11.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
EBUILD python-docs-3.7.7.ebuild 635 BLAKE2B 65e9b1107639426d2bb5c56fa323ca49a7aa584378f2ecbfc521e38fe3629e039815843001ea0b8e484f51288543ee2b093013b22491091b0a98ca155c6633ca SHA512 d1e6f0e50158e757d64bda589ad07589761ada99de48f83236665eb958f83baf952abe3b44180ba4b5ca30497090ad4912a602b2f8e4ea49bf11b53de11181be
+EBUILD python-docs-3.7.8.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
EBUILD python-docs-3.8.2.ebuild 635 BLAKE2B 65e9b1107639426d2bb5c56fa323ca49a7aa584378f2ecbfc521e38fe3629e039815843001ea0b8e484f51288543ee2b093013b22491091b0a98ca155c6633ca SHA512 d1e6f0e50158e757d64bda589ad07589761ada99de48f83236665eb958f83baf952abe3b44180ba4b5ca30497090ad4912a602b2f8e4ea49bf11b53de11181be
+EBUILD python-docs-3.8.3.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-docs/python-docs-3.7.6.ebuild b/dev-python/python-docs/python-docs-2.7.18.ebuild
similarity index 100%
rename from dev-python/python-docs/python-docs-3.7.6.ebuild
rename to dev-python/python-docs/python-docs-2.7.18.ebuild
diff --git a/dev-python/python-docs/python-docs-3.6.11.ebuild b/dev-python/python-docs/python-docs-3.6.11.ebuild
new file mode 100644
index 000000000000..2804f868635a
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.6.11.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+
+src_install() {
+ rm -r _sources || die
+ docinto html
+ dodoc -r .
+
+ newenvd - 60python-docs-${SLOT} <<-EOF
+ PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+ EOF
+}
diff --git a/dev-python/python-docs/python-docs-3.7.8.ebuild b/dev-python/python-docs/python-docs-3.7.8.ebuild
new file mode 100644
index 000000000000..2804f868635a
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.7.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+
+src_install() {
+ rm -r _sources || die
+ docinto html
+ dodoc -r .
+
+ newenvd - 60python-docs-${SLOT} <<-EOF
+ PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+ EOF
+}
diff --git a/dev-python/python-docs/python-docs-3.8.3.ebuild b/dev-python/python-docs/python-docs-3.8.3.ebuild
new file mode 100644
index 000000000000..2804f868635a
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.8.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+
+src_install() {
+ rm -r _sources || die
+ docinto html
+ dodoc -r .
+
+ newenvd - 60python-docs-${SLOT} <<-EOF
+ PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+ EOF
+}
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index b29ff9bd5053..4fe4c541ef10 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,5 +1,5 @@
DIST python-gnupg-0.4.5.tar.gz 48792 BLAKE2B 1bf9cc1c8efafd4fa783574724852d0f168d4d4d4ec188bade9a3ff21be61cc1b087bd4ae72f11f189d182cd49c765d9b57ef22d954a69555c0368f1d863f1fd SHA512 441b49e1f87a7e8e3abf2d6e90f677dc33f1b66a36483787f972378127f31308bacc5e200ae254dd75942191d2fabd61ca5a2f200cf5400be70957942f889ca4
DIST python-gnupg-0.4.6.tar.gz 52527 BLAKE2B ac616bebac3c5d0ac35c2c1a9353b4ee700848be2469fabc4b6df9f328868638f61211adc786ec59a24f122106ae53cce68d0f16c33b64c2d3d27cb94bf17956 SHA512 33b98bdd1c7d211d31173bbea2358fdfd2dabdbd5e70d4b33035a0edbf666bdba7319ffc847c8617f2626d1bf5a91102f1103c0bfe651fcd709d51ee821be104
EBUILD python-gnupg-0.4.5.ebuild 711 BLAKE2B 754235b876936b56473f095f10b7d7c30792343351640fb99f091d01d4398780387653751a3cecbb6fc17e167eedc1b816abf032c814cf2fd194a70fec87e551 SHA512 532b2047c00ab3ba4fa9f239ce48123260a9f46ba26b03ddde5accd64ed1fda6db4a2c3adfd084ff3b63f90c5ed7ebc28be7c755c18ff68e74e27a73160a55f9
-EBUILD python-gnupg-0.4.6.ebuild 683 BLAKE2B 8ad67025f8bb5e649d92c3c30f0204e6cda09094e2f374176493522b83e58a1a18b2a7afbdc6ef1035ce586f67905a9ace2f85a72f17be106259c6abd05e49d4 SHA512 77e0afb21f5b61d85b98fef216d816c2256f8ad3c0cf76fb6317d8cd1411cc9dc37fda673230004b74b7620723b6829119561a148d63a413d2fb339d52c705f3
+EBUILD python-gnupg-0.4.6.ebuild 682 BLAKE2B cb5da0bc4ea51d4fc3b90174b9383c6763ee03d98f7d256b384755190c4c008120d416149d80c324585b1ab184e5ca963c193c5bb2443b1c5b14c2992cd4a2cf SHA512 831000fd446ff089d71125b6a42c1175e6766bebe008ca34b4ceffa4d2e93e7c814089b19f208829ab254dd3528f07ea8fd126b84b93e96b93eb9adb88a40e55
MISC metadata.xml 645 BLAKE2B 23e7cfc3792cd9aa1c8eac9c52fe3d01076f93880a17f4fd8aed0c6c30d8e00b866a9f3e71664ca08c41d1a8a6ea4a1ef55a01d6b12285ce36aa0654e2a837ba SHA512 77f5c9739da1875f655257da826acdb16e5dbdbac02f5c05ab66a91c842d63b478b26af52901fb6dcb2ab0b6ea19c3ffd09e761ddcb1df0d5e55d25c105fbc65
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.6.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.6.ebuild
index 499da4e413e1..b20e829162cb 100644
--- a/dev-python/python-gnupg/python-gnupg-0.4.6.ebuild
+++ b/dev-python/python-gnupg/python-gnupg-0.4.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-python/python-jose/Manifest b/dev-python/python-jose/Manifest
index 17b4bd866e96..f542c4709ecb 100644
--- a/dev-python/python-jose/Manifest
+++ b/dev-python/python-jose/Manifest
@@ -1,5 +1,5 @@
DIST python-jose-3.0.1.tar.gz 86726 BLAKE2B 82ad3cd1139b367d179e965aaf0e33f3592883da6b21ecb3a91e9fe98ff05dbe358e56156a3d34366ffc0d7bfa9efbcdef67c41307d803ac16144a0c0ac3570b SHA512 a39c3aa9acc6bcc0030e4435e499581043a820c54aa1a4b67ae478cf95f96f28755b03fa4453e484932a64865a61613a1ff4afe30249216e8f392638485693d7
DIST python-jose-3.1.0.tar.gz 101693 BLAKE2B 1ee43ac5aef673f32c3d56e492784e28939b8f74a8232a83d31381b3f978d96ab132c94527df686b52f60c2865936ce022c2cd31ea66f009a83772d1389a7d4a SHA512 c4a04bed8fc17d65cb8fc9b2cf37996edb50fa0dcdc2dedd76a97c784f8af34a9c86748ea2f9ea348955ce780035fbe3a756abc8e1eb5e9b77ad57d411622c6b
EBUILD python-jose-3.0.1.ebuild 1204 BLAKE2B dc1a25484f1a36581090967e8dadaffe471cbe37360043b0ffaf88be4f3d7013bc4d3e436595de859ea0d6e66dcc951d6de326acbe5efd412286f735e7713af0 SHA512 2f892d605794ad628653fe3f2a99e713eb8caf27b50a5360253085f2eec14d56093ddfa584ec5b162264c169b3ecd5075062f998e2fcbf6c912f755180675544
-EBUILD python-jose-3.1.0.ebuild 1078 BLAKE2B 2a43e771d70b8287c4b50223620ac8b8c0cc96c1fa97bde9955153ec1fd3d9b4fdd679a5e6e26484c9f417452b6c8f6aeb84baeac215bb20a1e8ccca392bfc58 SHA512 237d5b6fe980902a4dc947b6d6bd1d626711582ae97c26d8a8ce32d0c90943ed28f9a2cd1acbf494c13fc2ede51704366e3ad00ec43f6fc872db92d9cd79dd0d
+EBUILD python-jose-3.1.0.ebuild 1077 BLAKE2B 1671774b5403290ae752bcfc1e5f1194093687dbef6895936d15d07885c637853d01ed69adb2f1535081490b6253e90322383cdaa1171fda0f75d116f2405ddc SHA512 62cac143d24c40a91a1abf8f05de81fb5ef9e5a11851217366001b686d6b0273d3542c2ebb166c25114d41af6be34a58389bbfa3cc7827afa8701d40a51ddb16
MISC metadata.xml 545 BLAKE2B 239d505d9411dc5e1f129f6f7c922d9e2ceb541b1d1706f75aee921862af80c94372100145eea73b3d25649c97371f83d6278ef4ef9de65fc1049eaca1f4bf88 SHA512 8192d2511a4a14c938f5a6e877b83ddc850982a9f2e07212bad1da48e7eab9a698466caa8a31780f37bb82135eca7383eee62553f21b5b7304bbae8e2eaba1d5
diff --git a/dev-python/python-jose/python-jose-3.1.0.ebuild b/dev-python/python-jose/python-jose-3.1.0.ebuild
index 245db2d0d907..78bc93ccf8ee 100644
--- a/dev-python/python-jose/python-jose-3.1.0.ebuild
+++ b/dev-python/python-jose/python-jose-3.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mpdavis/python-jose/archive/${PV}.tar.gz -> ${P}.tar
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 4d319934b565..dec4dbdb91c7 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -5,5 +5,5 @@ AUX python-magic-0.4.15-fix-jpeg-test.patch 1768 BLAKE2B 64899d227643a8a09d27e0f
DIST python-magic-0.4.15.gh.tar.gz 75476 BLAKE2B dad4973f69a21d08972e1e29bc92a51bc92f405907cc28f18eb9357029afdf9f1ba68010ce651acd821140d60dc10eb2e04138627fb19d132f185a2831fcea28 SHA512 004d6bfde52d58a9d3019ef4ff8c5b18b6a4206bf89820d3a0ae0ed78813f80dfba422aee9685528f88c990526ba65fa2153ac3b95b8863ce6cb3ebe925bd780
DIST python-magic-0.4.18.gh.tar.gz 856291 BLAKE2B 882c86d3e8995d1e1b6168637a01f4f8bc86f23390b1c67248baf46d16d574a41789938ccdf0acd83db0652678ab0fa0f6e043eb2c4a75743e5d448e80530da5 SHA512 d5f0047c7537ce0598537629c60aa708623480792d489fa003328b5c6c5b0d42748b6e996f27dc2c164c598813fcf19393567e7ea266a9f0718cf2ddafbd33ac
EBUILD python-magic-0.4.15-r1.ebuild 1179 BLAKE2B 401a4db2a9d6aefb67229c51e53da0aa9fc36ab99159c8579cdda0429b4666e880307b532eb2405c4e2b30dfe4451d600b20684f20b73b162c7833eb7e5d455d SHA512 8eed0841af63fd4290a9d391cbcb10bc4b112e89f5c4c5a24ad5c5854447c850fc7fc1e689733f3068b62dc361eed6ef0f57126441d434034c32074ec664f166
-EBUILD python-magic-0.4.18.ebuild 760 BLAKE2B d9fe02ef4c6f110cbe8bd930d5499ecd60a7a95895e70616cc8cc2416ef591398be2d95024e045bf3405f355b9c6fd3e04a888972dc622fe69f1e46ddedf97c5 SHA512 d5e76e1fdf28041a5d068321e21f0d58025286d8e9bad43210a9dd71e256e743614a09857d42d79415fe5e9293e3a806ae79fcd25b373105a3aa32d5ffabc23c
+EBUILD python-magic-0.4.18.ebuild 756 BLAKE2B 08b86dd866b271a400180be4b0a70166ef9543a7afd7ac46a32663c3adc9ad050e7b1d1c5f429451971abaa91c7ee359de46d144db720ed6d381b24c42749422 SHA512 afc88fbd58f90b6300590c0db2f1add45b958a73f111f0c96d7a25f768159605b3e801ba7eb513e9cfe85c5afcf8474a6b32226e69717b630fc91e8125cbdab3
MISC metadata.xml 498 BLAKE2B 74961e260f07110e36c46b4ecba047d325fa74c5b7d45376976720cbe378d8fdac68be1075b3027dfe0b80c8b60445e2449c9d437a2e04c7e5eaadedc9ce0d6b SHA512 1e4c6799db1664066d98cce7fdc47f0397e8dd42acaa479e0610fd4273c15c5314a47289aae2a31f7157207d019069b1b322592a1825b516a66461fcefd23429
diff --git a/dev-python/python-magic/python-magic-0.4.18.ebuild b/dev-python/python-magic/python-magic-0.4.18.ebuild
index 681cb207e6ef..c710d78be121 100644
--- a/dev-python/python-magic/python-magic-0.4.18.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/python-mimeparse/Manifest b/dev-python/python-mimeparse/Manifest
index db1d694c1797..52d2ffe30e2f 100644
--- a/dev-python/python-mimeparse/Manifest
+++ b/dev-python/python-mimeparse/Manifest
@@ -1,4 +1,4 @@
DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
-EBUILD python-mimeparse-1.6.0-r1.ebuild 592 BLAKE2B 974c0c76c435c5d8236eaa9e1dcc97e9cf6a95180ba8bc558e6ec545fad48b01b95c61944a1464e072160b5b597ada007d2c68535ffaf7cb116ee32405b9b8d2 SHA512 f8cf6d105543eb9ca27c0425ea666f8481a9e05643a46149c1717a55f9c2dbb89f1967707643745619386690d7eec1282e0560da9b0baf43e5841f176e2b9083
+EBUILD python-mimeparse-1.6.0-r1.ebuild 586 BLAKE2B 13ca9285c6e56cad86d5bc7d905ec299c177035c41995f220c89468c9683911f2d8c40928c919cbc4c0e9ba7707439bc34dc701a7d180a41131e5fbecd721124 SHA512 7e99f4b10e62b026c6dfcd21b4c07309d388385f7019287c4b03db0fd34dda16d682f4c671837327674f1e3cc74720382ab8b22071e186cd3f536c2a479c6ebb
EBUILD python-mimeparse-1.6.0.ebuild 984 BLAKE2B 2c276ae0a8dadca8ae5900cc16c96bd5b1407cd07abf77d6d658648bbe24fb513081d4e422acbd1514670db66fa49f9c00b3883b57638cd82f8bb7a4eacb9414 SHA512 04f103fd15a7fdd62da234f920d074f49863c2625f850f13c6d7270a085ab1bfeeda5ea1d3b46d1db640a16e2f0f5d6e470bd9fce03865a9778c7438e55f7bb6
MISC metadata.xml 394 BLAKE2B 076eba4e701e0c6274b4e3e3510faadb92c02d2ef35ccdee6626a3e4e5b46c91c912feb325e4b3abf33a19d5e6937ff4d6b2aa4c1209c682ca4badd59f35b478 SHA512 900355ef3cc835ae4e0766614eaabcbe701570fc54e1b00cfb55eeeafb0b65df35e24ab272eef54bbaa7aa0540cf89931a9bf58f5b515fdd6c88d303fec4518f
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.ebuild
index 2f3f88f83972..5f4d04cc79d4 100644
--- a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
python_test() {
diff --git a/dev-python/python-musicbrainz-ngs/Manifest b/dev-python/python-musicbrainz-ngs/Manifest
index 63fe202752bf..7148c7841d08 100644
--- a/dev-python/python-musicbrainz-ngs/Manifest
+++ b/dev-python/python-musicbrainz-ngs/Manifest
@@ -2,5 +2,5 @@ AUX 0.6-fix-test-submit.patch 993 BLAKE2B 3347bd841f0f1b23477f387275ad8e6d40fcff
DIST python-musicbrainzngs0.6.tar.gz 110948 BLAKE2B 9528d966565f7c927a98d311dcbb6db73a84614efa3eb071fe944b29b655526f9dd6e8a4a217428883d30b93c18e45c3d752d321d3c0689e5af00423b5fd7faa SHA512 901729f736b207f2f086e3d44a3515d405f6621706ad9c7ca07dd304349e048c5790bb16b054393651808bac4905ceb9493dd66d9fb17a1612692427c0bd3bd4
DIST python-musicbrainzngs0.7.1.tar.gz 112302 BLAKE2B 1c0696c72b8ea78d182300c76c0040117e1448a7955fa9aed8e42d1ebf9aa1b43359cee1158920fa31d3fb7536796130b54d0d45f351ddb5449d8f022a55f552 SHA512 a674c38b5084d1ae554dd03d1b3e613b48f8f3f3ada67f8d608130cebd35f0640ca65f8b4d224c1e660975274b0b077ffae29739ac2dc5a7078ca87eb8ccadd9
EBUILD python-musicbrainz-ngs-0.6.ebuild 1195 BLAKE2B 45fc13c619c250077a781e23368ee2301e962605ee91660c5c11495802b1cf3e46ae145a34f2bf1ab60113ae5d840db5a353aa8551754dbedbc05a0c0605d9fd SHA512 232285796b411c587660196112feda843ace095214cdc05a13914c935694b12f174e1db5b4c3fcdef541d8689d673f10565cd7c369935fea5dfb47159ea38c87
-EBUILD python-musicbrainz-ngs-0.7.1.ebuild 917 BLAKE2B cef92aea67cf6a67870a1ef398de497c2182ff8385a86cbf09ee1b86fd7d1983384e1642a4599581a62bbdfd07b1da7b56293494cefa8f41c684d2d720c84463 SHA512 fcf90c132025a0bfe88da66ec213def759a65dc532b8f013055893252f09e35c573cb93d405172eca12ab90b3f9a3d34d1569dc2e198cfc185ea0498da4530d5
+EBUILD python-musicbrainz-ngs-0.7.1.ebuild 916 BLAKE2B 9db2e0670d6210801b71e722627444fa1e3df0257a9f6991748bc013492b14f5462f77ac690c17584549808c3b8d17cc3cc1813b4b68a763647df5545565a445 SHA512 f4bccde8c52fda9138360858a19811200efd45521aa97dfea6c61a01c5f8fa337c839d96f3671f4080e3e8d4fac7ef00457c11984116dbb7d394d436c4ddfcbb
MISC metadata.xml 850 BLAKE2B cff60327b0cffec47ea9a378880dd8c48b9fb7abf684b6c6e0686064d4097dd6e67c19b2495f971689271ecec80dc9ad721562057b6e451a5f52301d9a244f2d SHA512 e554fedc0d886de2e7b1bf60bb20a24b327a3a1b7f8137c0828a52d7f1bd77b00fedc17c6147b7bde7cd48d80888bb4a988faa56fc4a8a5c209ace57a618d0d1
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
index 1977a6d5c123..e3219d17cc98 100644
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
+++ b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/alastair/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}$
LICENSE="BSD-2 ISC"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="examples"
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 832ad0419b53..52a44b6d790d 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -3,5 +3,5 @@ AUX pytz-2018.4-zoneinfo-noinstall.patch 579 BLAKE2B 1d21d01160dbdf6c6848c2c0088
DIST pytz-2019.3.tar.gz 312286 BLAKE2B 8a81caf3ead284a66404fadeca4f17a603a4f0ab2404f9b73b2b06a209d0094a25549065aa14d254239d6d842804c6924bc7658a876517b170f535be71868ead SHA512 b925b59d197e7007dae8098d35518a470e4b7588d9114f51e4d8816813243a9f816f662055f690bedf56b86cc9ece06428ed8c55e5b3ed676ba0f504f7cb43af
DIST pytz-2020.1.tar.gz 311771 BLAKE2B 2d7dd9987fd912dd2a62b5c4ab1667a13f3704ff407796c00fd76b6f3ac4dfcffba9f58740f9456ddfade6c2ef6deacc754f57f5e434b97da36b36fca3024d0f SHA512 4f652ab400bac0bd83ed305be7540094e674029a0cbde7da280adfd911b8c0a44023799b7c61971a5a61a1d6e3992c5b621e5e95bbfe962f310d5f26d4fda3ce
EBUILD pytz-2019.3.ebuild 998 BLAKE2B 2071e46018cffaea4fc2664b357e17ea49ad12b2f53cd63a6018be3a2fbe2bd32f9e8a159c417873bc665a3d0ce87b2e59bad2fda20ece4346c4e819a869670e SHA512 07a167855fd0791f67d1e364cf6596d1d9e9234f1b43d19ae1eb9fe2e58e1c62da0a0082d8c6a320a438d547e0676367a980e2e65574a919b58e62c495422a86
-EBUILD pytz-2020.1.ebuild 968 BLAKE2B 6114281f06cadf21ec2b1ec3b2aa57a4d62bafb6b7485d9938ee9597c24752fff87217c8c1ac62e6aacec111eb9709a57a89aba514596a7b36d237d37c912487 SHA512 e15faa300d483e9b783ca7db9f455eb97e6b358b861a5cbdf86733b9156af1a2b47290504add8403fd7093ecf28f7d307bdb769b3cda6c06a9e74e996865aae7
+EBUILD pytz-2020.1.ebuild 962 BLAKE2B 99370ca26afe59d90e444ffc7f17547eec113891c5f98b93be2ee51ae41a225a5b5b15891747b60314c2b82234a4d60fc5c129e69e465580bf3bac0c03765cd8 SHA512 e46af61d750dccb2d2b8be491b33aa7e17a947b079d9995cd12cf3b2bef24a122f8f57411b687b63314791dcf159470804a54ef14db0ae68fce7680cb3e52959
MISC metadata.xml 764 BLAKE2B d26c3334bd7cf99b7a8a7767def5d9ec82ee6e335e27aaf891a47c5037eeb2816457974ea99a1cc865359718a5d7fc30e41f68d8b7ecc82a7a7e87b5943c10ed SHA512 6160a54921cc7c8f7dd504121b359727ab14ef9277bdb96720a31c8e32d223d29080cf9eb76531a94da8a5c7752372938fa5760e4e6cc77118a4792c31813580
diff --git a/dev-python/pytz/pytz-2020.1.ebuild b/dev-python/pytz/pytz-2020.1.ebuild
index 1c553363fab1..bb3fba0df7a6 100644
--- a/dev-python/pytz/pytz-2020.1.ebuild
+++ b/dev-python/pytz/pytz-2020.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 26c9c7a8d0fe..3d49d2526f52 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -4,6 +4,6 @@ DIST qtconsole-4.7.4.tar.gz 424884 BLAKE2B 79380a1619498a28eaf7e741a3408a63b5870
DIST qtconsole-4.7.5.tar.gz 424850 BLAKE2B e2d2ba50ce57b13504bdf8ad1ee3374b76abc980f0b74dfe1177c3f066ba24382bc51f8d3db2614a8d74b198ed20f01fac67c288602ae6e31fe90165e63ab9e9 SHA512 ee57ad2de5b840ee4e7f439be08a3c82fd39ef1bf6113b7eda95fa1aabd132c799ff584a2ac7f7e2c89df4bcd9a9409bbaeee108a6bb49e6197d2e3395336ad7
EBUILD qtconsole-4.3.1.ebuild 1680 BLAKE2B 249564f33745d57c14439acd6cec7af71829d3d31e4982ee5c57ce71ba469053cf5d5932f4480d1f30f3f0556b27bf2d57a59de54556673568f282011612fbb0 SHA512 ae28aef823f50eebce4ec374704bc83ba3accd1bd1a9df72709dbc3c46c8a45a74f5e33667360fc8b64a349210368ae4d5151ae73cb7d13f70b839f168d9b3ae
EBUILD qtconsole-4.6.0.ebuild 1283 BLAKE2B e551099568780f4f9e05dceee530499b8e7953d8b3052a7a1b18125dca93d9df453ee7ad76da67999865acc6f81ae9946a7965c69e71de66ff6292e1f8bc2139 SHA512 0c48143d092b3b582314c07967bc9be1c727fcacbf37dc60676a7b6f146d17826c79fc847cd31feb194a16c093885685da1fb41af06e1964df2f362c60a54569
-EBUILD qtconsole-4.7.4.ebuild 1236 BLAKE2B 1c5f96f1dbec7e23921ce0c3d273b90b0db9601ea9daaa5459369a2cb78f227bc979c59ced22cda22311802cde2dd9efe818ef4d81ba7b7529ef3b9c8abf22de SHA512 961c7732cd730e3c6c0029b4006cc173226c50c813ea8644564f73f22dae9e4a7a89e88dc7010c1d90250e7b8e743a6d1ffb05839de99828ecf710ece40031a4
-EBUILD qtconsole-4.7.5.ebuild 1237 BLAKE2B 8cd414d9d54885e2f70846384f73cda49be0a75e464ca24aba07a69e37db86786c8fe0ae6c96a833fd0f2e45aa9e29d0debd313eb66e3f741cbc2e301b8c1789 SHA512 7d604d90441840f02810fcd32fcc7d03b4843b0bb103fa6a04efc410c803c7572a5a877ae36497f34d7bc072d2ba0713c7ed0aeb56f49c61d63a02a03504dcfb
+EBUILD qtconsole-4.7.4.ebuild 1235 BLAKE2B aed4738682e6e62413307d81b7d61e35464a694835b4ab32d31b9a897a2506397e5ac7a71e2dbc4d2f9c68e4ae657e901a7ecbdf16092839ebadac98f19e92dd SHA512 7efbd4cb9e8efca45b382476f63ef5bb5837fa29b14b329b0d79690c4fd0c890e993e6815fb425e3112f11c6a24e9aedff4145473b922cfef9a1a6ec56ab3ffc
+EBUILD qtconsole-4.7.5.ebuild 1254 BLAKE2B 15c92570050a4b8552bfb34888d5baec793537525beed4c2e691cf48fb1425a0407ab6d0dbc2b56004acb6c9ae7c1e691aec9839d84be02a90831aceffd531f1 SHA512 ed4edb7506bfcdcc63ca26f9a7ef63069a8d24d4eaee865f1925404fbd7ecf3b01334b2663cc28028a9c4e176f07f7e75506d20fd822a1f8fa6fe9375e1e1055
MISC metadata.xml 664 BLAKE2B 33ad7b3510f6778cf805068f3edd12fcb235980ceb60d06a94e977be60372f1bb8119545a47ba04fbb636a6cb9c072ae1e2581cbe71d3b7d598cf54c5c99ea83 SHA512 fdb5f97ebbd75a451b1247fa015fea8ded2b428453be34140bd5151d2c0a9cba74cd91258903826dd1e419bf8b818c37f3df74ab2b573119628b9b918f80f69b
diff --git a/dev-python/qtconsole/qtconsole-4.7.4.ebuild b/dev-python/qtconsole/qtconsole-4.7.4.ebuild
index b9aa30d6b720..963b15e210a2 100644
--- a/dev-python/qtconsole/qtconsole-4.7.4.ebuild
+++ b/dev-python/qtconsole/qtconsole-4.7.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
RDEPEND="
dev-python/ipykernel[${PYTHON_USEDEP}]
diff --git a/dev-python/qtconsole/qtconsole-4.7.5.ebuild b/dev-python/qtconsole/qtconsole-4.7.5.ebuild
index eab98c37d95e..b8f4e1d3bd94 100644
--- a/dev-python/qtconsole/qtconsole-4.7.5.ebuild
+++ b/dev-python/qtconsole/qtconsole-4.7.5.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/traitlets[${PYTHON_USEDEP}]
- dev-python/QtPy[${PYTHON_USEDEP},svg]
+ dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
"
BDEPEND="
test? (
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 328a9bb18646..b77e7326fe5c 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,5 +1,5 @@
DIST readme_renderer-25.0.tar.gz 24116 BLAKE2B 978fc6cb9d92e35a618af89996abaeecb4611f0351975af44341198dc26ccdba4c0a4e32c126ce22fdbd77ca1d2dba4e11f70ea814a5084c204f4cd53d95f7d2 SHA512 2decdae26c07824c7148b0d49f58fb585fa4e78f06ea97cd7a1fe2fa4ca17601d255eea4b96dcb384c676bc6b671caa0a1bf51615223cd48081ab18da76944a5
DIST readme_renderer-26.0.tar.gz 27068 BLAKE2B 7a58d550e792ffcbf6fedbdf0464714ac7c7a0395297d165493167947c733a29ff5cc4dd2a346c4276f52ca0516282b3049f28bdc8eb38717d1ff8d03709084c SHA512 a5e7cfa47257fd3ceaf417cc814226b5aef6aacf72ffb2eeed3e6affa4a09aa1f6c752a8c4311910c258d090d94f03e3f5c2603819f5dceb37440c9bfd9090ea
EBUILD readme_renderer-25.0.ebuild 834 BLAKE2B 318c88db580f9fe28eab159bdb67382cba7ffe88e5444cca837834335bd920613896f6773943d9d4369b053fa36db87ca6d6e59de7246b1139e07c292ebc36fd SHA512 9c06acc6f788c24192c28b9b1c86615ead73fea0462d9bb91afe78c7eb8597439411fed8c2683f1cff6a7cbeb9006477090479f5ff297011c30486485c82b2d5
-EBUILD readme_renderer-26.0.ebuild 842 BLAKE2B 4092a8e2f2d59439c9723e09d47839970fefbd1268e29da0818eb75d33f5cd48bf1c01a8a5574444c5c17e762e0ec223a618e19352f69113028c3d2797b1e300 SHA512 22eec30dc8af1ce076551a0b78c51dff2b5b8f4edbc59f2a77f8e70ea9fe01cb91eca239dcffec014922cbd3f78dea4cb2c903a13d607be61c0d66418408f7c3
+EBUILD readme_renderer-26.0.ebuild 839 BLAKE2B e95f3eb8539707d808038fce28dc699d8a72aa605faf0894c653f85b5c70e76c34ee841600c9cd0cff6a50924c78f6c9f7703d96818115b9203e9b424d5b2908 SHA512 ec414b9f0d0faf37873647cb162a47c32cab21577de71c8e6efc9deec1d9bb40e08f42d482ba485a57b6fd18c1749fc5dd006b1b54df226373a78ab229e33645
MISC metadata.xml 390 BLAKE2B 2a81aedd6207fe28eafb76c0eca7ead7543282f84979e07f3b417a4fb9ed6be27a33e6e41f60c37b649cea7c8bd6977703e596760d44a734a0ba3fa023339bd2 SHA512 8594fa46429779b659f2a382d3a6607bc36476387c17c493cc7b9217c5e8600694f597ba5657e46ab7b1d3a75aabf3c113a538372b9a4db58a4b986c41bd6b7f
diff --git a/dev-python/readme_renderer/readme_renderer-26.0.ebuild b/dev-python/readme_renderer/readme_renderer-26.0.ebuild
index 32744b6eb0dd..0c920278102f 100644
--- a/dev-python/readme_renderer/readme_renderer-26.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-26.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
RDEPEND="
>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index 009cb7889360..6269eae0758e 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,7 +1,9 @@
DIST readthedocs-sphinx-ext-1.0.3.tar.gz 11589 BLAKE2B 9c6ac1bd3baa2a92cbc67d18f5fd6b3f63ce0fe7cc16832ad23940c7b8d85d88f299c8cba6623d0c2b229cbcc43e43ece926aefa01d6a3055ef9c252ddf68dfd SHA512 571336adbb3f6c9077d2530562f5d72092f8df440b282187fca5aaeb2a9c281aa49bc29423e550905696a200f692ebcea5fe6f83e023f64759224697c49e2f03
DIST readthedocs-sphinx-ext-1.0.4.tar.gz 11686 BLAKE2B 3c188e52682f8c24633f79b9ec0eed7f06c922989f7578f06e0ede0e3844ca019e1905450df8d12150d05f3a82a1103a0786cb2c60dc3551e3e3097849cdc301 SHA512 52f45c26ae934b44a41073a9e77096ea8ed97f2a36ed1ea9b63084be0af58dcff24c6b729cda7a8b631f9fe5f56822ceabdbbd2e11056b44df18212986cb445a
DIST readthedocs-sphinx-ext-2.0.0.tar.gz 10570 BLAKE2B cd1d424ede0958dd3d14b0b3f207e8080b038de294d003244f81d7eecaf5d8ec9a54c22d77460096b6bb3b70cab0b3915f94f0c529e9754a39351f7a4201dab5 SHA512 7cbed8a1ea0ed9f61d9fdac7ed283c7f49d78d8661ba7165efb763a4afd34a47c557174e855f73637e5a9aeaaff0c5acef1f1d273363432886343dcab71c29aa
+DIST readthedocs-sphinx-ext-2.1.0.tar.gz 9961 BLAKE2B a172fb2b7bff930f4ef728c5509e0a303bd46fd07e5da496721896751dcd0fa4fa4ba3b4d3251931598cb6172e186a3f340100f13d88c840bcb6912e5a134185 SHA512 81e60f3b6216e1c0fef12493e668cff561937bc5da965b0dfd06dca2f034f95291dfa977f94f726ec7f0bf048fa57d9fd7887219ec172b14ff2558be5e09a130
EBUILD readthedocs-sphinx-ext-1.0.3.ebuild 744 BLAKE2B 5dde443b18bf511655f0223083aca5ad11ebcc97840c336dc0ad3ed31ff416642aac3f2f5ce9322123073cdb96055a3db7ec2ff233cbc26ff82fd57ec0f24e36 SHA512 ec5b906cb67edebec5c0be395a80be33d925e6313f8cd2a2b7c6a2bdbb3e49a2b6ee3510ab9d29d54b0fc8c99122c31dace0af5798c0b15252ee9417703ff67b
-EBUILD readthedocs-sphinx-ext-1.0.4.ebuild 744 BLAKE2B 5dde443b18bf511655f0223083aca5ad11ebcc97840c336dc0ad3ed31ff416642aac3f2f5ce9322123073cdb96055a3db7ec2ff233cbc26ff82fd57ec0f24e36 SHA512 ec5b906cb67edebec5c0be395a80be33d925e6313f8cd2a2b7c6a2bdbb3e49a2b6ee3510ab9d29d54b0fc8c99122c31dace0af5798c0b15252ee9417703ff67b
+EBUILD readthedocs-sphinx-ext-1.0.4.ebuild 739 BLAKE2B e9880dad672d5cdb631d20477524cb437caaece3b1c59f8cfe65a72e444b5367587ef69772c6cae0595ea3ed050fae4d65484fbd23313f45385d83a6007d0d89 SHA512 b24d47ff289388c82bdbd50bdf109a0e6203b31bac053998c25aa7b629b4d3d94e695d0fe7a21384c1cee7c5aa9ce41bdc464343b860dfd924bd273411612878
EBUILD readthedocs-sphinx-ext-2.0.0.ebuild 744 BLAKE2B 5dde443b18bf511655f0223083aca5ad11ebcc97840c336dc0ad3ed31ff416642aac3f2f5ce9322123073cdb96055a3db7ec2ff233cbc26ff82fd57ec0f24e36 SHA512 ec5b906cb67edebec5c0be395a80be33d925e6313f8cd2a2b7c6a2bdbb3e49a2b6ee3510ab9d29d54b0fc8c99122c31dace0af5798c0b15252ee9417703ff67b
+EBUILD readthedocs-sphinx-ext-2.1.0.ebuild 744 BLAKE2B 5dde443b18bf511655f0223083aca5ad11ebcc97840c336dc0ad3ed31ff416642aac3f2f5ce9322123073cdb96055a3db7ec2ff233cbc26ff82fd57ec0f24e36 SHA512 ec5b906cb67edebec5c0be395a80be33d925e6313f8cd2a2b7c6a2bdbb3e49a2b6ee3510ab9d29d54b0fc8c99122c31dace0af5798c0b15252ee9417703ff67b
MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.4.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.4.ebuild
index e8bb844066b9..c7a7c240b8a1 100644
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.4.ebuild
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
RDEPEND="
>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.0.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.0.ebuild
new file mode 100644
index 000000000000..e8bb844066b9
--- /dev/null
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Code specific for Read the Docs and Sphinx"
+HOMEPAGE="https://github.com/readthedocs/readthedocs-sphinx-ext"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ >=dev-python/jinja-2.9[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]"
+PDEPEND="
+ dev-python/sphinx[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? ( ${PDEPEND} )"
+
+# unittest should be sufficient but tests are very verbose, so pytest's
+# output capture is most welcome
+distutils_enable_tests pytest
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 804af80fd54c..01f397cc5ddb 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -2,5 +2,5 @@ AUX regex-2019.11.1-pypy.patch 10520 BLAKE2B 7ba3b494c1562475ab3e5b996083bd75e22
DIST regex-2020.2.20.tar.gz 681215 BLAKE2B cc23ec03dc83068320155e4e660ee27e00935d179566d007e21879506f80dd67b2c1abdd6a4dac789a239474a8b3358f1fcbcee53af91b3d2b7ef71ce19c7ab1 SHA512 0a35b9512048bd36bcbf8a03905cc77f007d204f9ed9a0aaa3d5fcd72392bf37285c35ec0f04b1520e486b651028063c799ec265782c52ca4ecf7eeb0581727a
DIST regex-2020.4.4.tar.gz 695848 BLAKE2B 0dc41e1f1464014bcdc10b7209f7ac0506aeb6a3e09c16b4ca302619aaa8271cb06138627e8ed7f64ff80cf661eb83f07b4514828cf7fa94f21211fc42ae9f7c SHA512 95eadaaffaf87a19b31024ad3cff670d34a31de8b9be430fc276a533a584203842d1634b66a346c4aaecf2407b973bb1ae9c8ee8b48785d03bd5e45a67a271a9
EBUILD regex-2020.2.20.ebuild 885 BLAKE2B f0de99b16a108fa8f8482715b6bf5f5d8c7c9f4bff71e99639a3d237ff82ef8b7780ff09809cfc242330b634ce49da7923acde092a14e989f4d806f5a5353c85 SHA512 e7cd546f566465ed6604fe4f72533448e7291bacec1f068ea40e81c8578a2deb93d0c50437357d2c303dc15ae503a675377f1a06aaf58c4587b0d7cba916e8f5
-EBUILD regex-2020.4.4.ebuild 893 BLAKE2B 5875deed47eda7c90cf15b19012caaf9483bee3f9b42f7c33008663fb09f6effcc6aac5a2391b5cedc9feedd66b910ed1509583dbca83ee997c4323823e4749f SHA512 f8c28aea15eacae904ac7bd136ed554352069108c68e4c094fc7a167ed0d486475e208ab53d9a5853fba8b9f4ea50cf8ad41146bf34c7d54314c4d23e440fffc
+EBUILD regex-2020.4.4.ebuild 887 BLAKE2B f0553c95a1e7eeaa47fb13cd83bd68107a062b384398d90266d29f9f9a571d64111328ce3d81677bd5d40cbb5f42b45728634643159685f67139d0b686e3716c SHA512 08603810d4bb6123cd0aa682f36a7e27b7beb1cd725721ea1ac932d4c80177100a78b876ef6fe9f3bd0f410b7bffd9db80405acd3ae9c0ffb11c2d54e24a82f9
MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/regex-2020.4.4.ebuild b/dev-python/regex/regex-2020.4.4.ebuild
index bd9de2dce63a..44c501e0bde3 100644
--- a/dev-python/regex/regex-2020.4.4.ebuild
+++ b/dev-python/regex/regex-2020.4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="doc"
PATCHES=(
diff --git a/dev-python/rencode/Manifest b/dev-python/rencode/Manifest
index bf32e75886ef..dc25e39f7295 100644
--- a/dev-python/rencode/Manifest
+++ b/dev-python/rencode/Manifest
@@ -1,5 +1,5 @@
DIST rencode-1.0.5.tar.gz 24530 BLAKE2B c650bf7befd62c8654bd0496f12f15a242a304ab9333bdf258222dd333081bd23715accdabbc55a271e8e869ca96f6aa0b43b335c6758be5b03073ebc05e3bb6 SHA512 809d7070b746fe77419e7b4d2eed274e1e0b3b4f15bcddb466806478a90f89965b0b456443b390cce6d1ca9df409367f336dd659f4481cd442e3cc459bd63c18
DIST rencode-1.0.6.tar.gz 25455 BLAKE2B def013a569a53e2b2d96b3430c13676810bc5879e565f091dbc44f1ae950b8ec7ca0fa5e35a974432fd71a1bcca5a3f1f18bb2a9f042480167ab50e4f0aba8c3 SHA512 f04de4d3a83aed916bdc4b7a8ca772655e9324d0531ee882cb7d2a1e92b397bdcec8497bf02939e0a806886ecc62ed2e7319dfee054dad1b69052157f0959e8f
EBUILD rencode-1.0.5-r1.ebuild 507 BLAKE2B e77e29feba0823350f3abd5f0c65301f3d52eb35e80574b9c992f8da8ddc0cf8ab2f4448d7d0342171a8ed01720caf70877886df67993148725960699ce3e5a2 SHA512 3b4cf0843befc39fb1a634f1ecc82bba4afb413714ff90c50e9c57decf70e9e4d1289e582c29776bdbce1cca84d26afd418c8c23ffc855112e2fb6e86d835c81
-EBUILD rencode-1.0.6.ebuild 545 BLAKE2B dfb3e0cd92f76f8e5cc277049a75701ac6570061a5c5cadb2d08099e2cf40f509f4acaa3e743549f80ceb32ff92ca28a82a39ad3f9b62159bf7e0af0570d7e67 SHA512 aab61ecfbae26968f911e382d4d7294dc96933e645efbe75f830a954499850a761ed2c8137df38017ad35bffcc95338e64991afda4e00632bb5d79cae3f63ad7
+EBUILD rencode-1.0.6.ebuild 544 BLAKE2B 00f4bd0a80f0d2838dec6a2560a747f579240c0601efeaab080f0c57b34a840e1f35698c57f6f7ba82525b03dd940cc5b925ffff1bfee1835ea1497d529751bc SHA512 fc09eaf1c4522082e626d14c684911a75db4538a72fee75defc31a13f262f7c74848ca645e87c734f121c35fe0873b778999d62d69c97d555d00d2b4ca179a29
MISC metadata.xml 666 BLAKE2B e4047d25b3bebfa106936f105ed4fb8ed1c07aaad32b42f5bb2645388028baf30b8fff228fd32737c2716c5273f6872c5290a6e132b850d4640fb1d44e257683 SHA512 026950a9462b1207463f2bf923c40bbe310c63ecf73676f935c9d392fcb7673b4150de82e7654ea0914c0fdbd6b1a110f00e57fc92b931a98a5e9ab032918971
diff --git a/dev-python/rencode/rencode-1.0.6.ebuild b/dev-python/rencode/rencode-1.0.6.ebuild
index b1eeadb23af7..3f4549c9b43e 100644
--- a/dev-python/rencode/rencode-1.0.6.ebuild
+++ b/dev-python/rencode/rencode-1.0.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=""
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index b430d1bce2c6..848d864fe5dc 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,5 +1,5 @@
DIST requests-mock-1.7.0.tar.gz 51705 BLAKE2B 1104422ab28678ee9e964fd853e7d61c23bc2f0dfb3861c2829578d1f91d533d195ce687fbc8596aba32da4b369050398d891125dc894e55fcb73ca81268b30c SHA512 6ad71fb87519f93812e8ae0d058a4b65a4492e86f05cacc37f95be1a6f0239a2c3f3d20a7e6f44bcc21f009574e4e78c2149394c2570d305efbdd68ec07b24a2
DIST requests-mock-1.8.0.tar.gz 59794 BLAKE2B 2bdcd180ea793a02cf34eda356d90c0e338cec6f3fb718564026d28ea06ac975073f291be9cb685f012c803fdeca1fe29139537529e292b91a3356f0b781f97a SHA512 252bce965e0fca03cd5ce09912c726045f9c632e90bfee13b06c9f3e2c6b70eab7f39cf8e7efb3b7d2cf2b5d79cc5c5ba6e2379b3d48ce33bf78861ada911918
EBUILD requests-mock-1.7.0.ebuild 1238 BLAKE2B 7947c44ed2addbb388d0f7b7d9fafbe8d99a451b8b9fa84557d9250d9f465e80de6e1c94ab47a01223d19cbf85a16a56810c63e13fe1c8d5d8b5accbc0ba788b SHA512 d8e4d920e4113e5a2ffbe1acfcf49bc040c3b8a57584d0aa1c26d7a69f5f4f55dfddc9ecf53ea484c9a52af96828cce82ccdea0f8719593022809f135c422b36
-EBUILD requests-mock-1.8.0.ebuild 1283 BLAKE2B cbb24a681301ed2719c89e3140faca77b58d14e97d06e3a45d58fd85892790dbdf05bc4aac921224ae68636b60b77b1fba31fa4f5c3e292d6388b47855b60a38 SHA512 4630dd8b77092879ade5729f6e7763f9d3e24b90b1ad981229c69fd4c0e1d78f35b3d0bd23ef42b2144da1e172180026150ea5276c0f413a6a60f36e82f47908
+EBUILD requests-mock-1.8.0.ebuild 1282 BLAKE2B f727bd0d9bc1e9898c57217611f3e85e3a8e1097711668a61e898d288f51678c345c1133c583020fd7e7e34cd5d023f3bb4aa502105f0f5ecfea89acc4883585 SHA512 fe34782a66a874c674fb45eae3583c8f689adfc2b7c3cd154e90e33bf52e6bdeee9e7f22fa9b42cb816a5517d735917521a5669efd7676163fc7978cb118327e
MISC metadata.xml 454 BLAKE2B bcadca6cd81b333dff341a15c22e548336cf6cf8fc342ec147783d516d72c1168991b61b9038979923e92cc3304c86021b2a38b39e5d55469b9cdfe95170a23a SHA512 9eb41db434308c8b293b881364482e08da91881266ae4d5b45dc79fa12b0187e5aabbd82d771ad7c5fe4e2840d581f9a8ce63658f0f3124a19e26a35c5f25119
diff --git a/dev-python/requests-mock/requests-mock-1.8.0.ebuild b/dev-python/requests-mock/requests-mock-1.8.0.ebuild
index 09cefc3c1402..42274f9c5c61 100644
--- a/dev-python/requests-mock/requests-mock-1.8.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
RDEPEND="
>=dev-python/requests-2.3[${PYTHON_USEDEP}]
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index a2b823900c1b..7629869bdcd7 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -3,7 +3,7 @@ AUX responses-0.10.7-tests.patch 383 BLAKE2B 3bca7b4ad5380fd13e29be1409d070d8ea1
DIST responses-0.10.14.tar.gz 24782 BLAKE2B 2c233ad41bfc1d9eeaaf84d2e8a98f5f808e39ffbb50c796aed6a3065827a0c33301c8d6ed1e7c4d88e6d0f7378796bdaba3816fd558f5797a725ea99835c54c SHA512 f7edf64d4e6d62fa7295b6ac95d60bc30adbf0b141d9624ed7ca03efe02790973aa8ebd3f93187d0fdb41e323c1d87184717b77bba2ea70a7ae25f4d9237314f
DIST responses-0.10.15.tar.gz 25350 BLAKE2B 6d9dff99e2dc18b7361cb2b75f0438c62ab771364b1a572823cf1fb0cdb6175fee8c4cd372ac5d1b27ef31b88e66dd7d1410429213af240f6f743f0c85e36d1b SHA512 513df58b40968e271cfb429ee09ab2ca7c3cf2f6ebe3607276ed1b949670871f8d6993449cfd5871bfd119cda0c0628dce6ebe8ed40595696e550541413f12b0
DIST responses-0.10.7.tar.gz 22666 BLAKE2B 9f6d8ee0cc36ebb94bf6ac4284b474d30754af339f623a8a899061392321ba48a1f2d21593fb5bf2e6fac7c65ca6c252b6b7a1072e5548f91db489633aa3b686 SHA512 dcdbac1555090309b17eec1c02887eea5080321ff359afc42e6b558954caec2ab757e6009ae539e6e4d002cd06f2289d909a28ae583e6fa062a5df89c301e1ff
-EBUILD responses-0.10.14.ebuild 891 BLAKE2B 9baf6db2b12499e56f721a5dce659df8b4c1dcc62e99693074a69c3482d9a41a99010471b93aa3197c1a5362fd4b0d6efad8df409cd30a3bd1d16b19de48c039 SHA512 71013aebf6c545f207574a33f2eef76dd74cb146f6530cdf707fd2f99c77d2a2e0d1ae87900630430341f9cd57a3ca2b2f12d881f913d9496748ad753a7acf7e
+EBUILD responses-0.10.14.ebuild 890 BLAKE2B cdff8a25cf60ea71364f40bec3b785025a1cede323777c1430a30acfdfe371f01876741b74d1cff9028ac3564fbbb0bb2f100378d31f7303e1084cd6fc612055 SHA512 63ca25497cbd9c0f0e3422b94e81c5362d9a76f0bd9c0b7514cb63284a91e924705f15b001d2f65e21786acd5dd1d87b5a5d89c28c37e83014d39e822afba425
EBUILD responses-0.10.15.ebuild 681 BLAKE2B 4320c6c1a575e494734792000f4b6d978d5b24e0555b4b077f291ef42cce0f739b91018c4042d9c50583205ee829875055f447710861e5bffd47c8dad4bb9f3c SHA512 6c55687cc49fb0d5505b3528ad96403b72714ceffc22fbb1cd868460799fa205631542424d5e3a76e908597788a3cc5a664b4f2bba2cb77fa6956615b7cd492f
EBUILD responses-0.10.7.ebuild 862 BLAKE2B 23eeb7d1780bf4224202b1c5d8b21d086ebc1a209e5080b2f23d26e7ebde9a85eb461ae690dbfa58b5c6fe04a62f911a52dc0b6166d3d073f45918b15e02fb42 SHA512 f23013dae38c96db5cf025a3b83910790f4f70b2f28ac491b1355ce01cbd5d6eb3c4adbbf6bfded90a69c17829f49a737d85c31b12e73de0d53fcd77910e91f6
MISC metadata.xml 438 BLAKE2B 9a2c389d84feb9087edaad524953e8a439dc914f293a1f5dc9a15f36101965ece4e28ab5f57b193dd30a2134b17e96feb218c898fd1164dd0c94234b54689a1f SHA512 efdf808423b4e47a6888b09d08b563f36a13867d355476ec10e7f247e6841bf682cb35c4432a011458d496dae79acb1ad4a38e03d3895a53e666edc3c9d4fca1
diff --git a/dev-python/responses/responses-0.10.14.ebuild b/dev-python/responses/responses-0.10.14.ebuild
index 6010ef70932e..98543821590c 100644
--- a/dev-python/responses/responses-0.10.14.ebuild
+++ b/dev-python/responses/responses-0.10.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/restructuredtext-lint/Manifest b/dev-python/restructuredtext-lint/Manifest
index 0341777579db..6b9de60c02d4 100644
--- a/dev-python/restructuredtext-lint/Manifest
+++ b/dev-python/restructuredtext-lint/Manifest
@@ -3,5 +3,5 @@ DIST restructuredtext_lint-1.1.2.tar.gz 25061 BLAKE2B 5be51fb40ac3eb0ba58c053d5b
DIST restructuredtext_lint-1.3.0.tar.gz 19008 BLAKE2B 45d4a0d02691dbd0f46e57cf637c7b61f6cd93daa5f98a6795b119555913d6dcec7035857ae6a3f73b777d02e7662c2775fa288f3ad7b7ecc3d26c961595f203 SHA512 983f38e51943cb7fd6a36181f99cd9c24c40deaf932ea8f69ae6568255a1ca8800aecd753067304ea596cd84bee4fdd5d96e935e06bf602613c57ad24113520d
EBUILD restructuredtext-lint-0.12.2.ebuild 620 BLAKE2B 002dbf00cd66b1c9bf808c2d703f5d9a8ed661c6951ed255bf898760a812698d7c76442fedafe840b20bbfe3a6035c1239186257a4f2114fb8e37cf5a69f7100 SHA512 99921e193fe519121d28fd1cd8c6f13a0b62d585ab95467804a7209f58155209b80a826dcde7f03948d224ad97cd777a64457f7a7c0524dd3b195e049e364184
EBUILD restructuredtext-lint-1.1.2.ebuild 783 BLAKE2B e989b21092500a41a17c41b9e0f5e389fcfe94fe1946277166c195cfc20e469bd2e93c99418206beb1e3b02bfeab99c747a025af990cef1588bdce0cda5d29c5 SHA512 643762dfe5d82538321e0756690d201023ca35ed94210d4e11b2092caf68b8bffa5a1c07ddde0ef67a3db4cebd531427b4efba217eb50c810aa057f696c8443a
-EBUILD restructuredtext-lint-1.3.0.ebuild 783 BLAKE2B e989b21092500a41a17c41b9e0f5e389fcfe94fe1946277166c195cfc20e469bd2e93c99418206beb1e3b02bfeab99c747a025af990cef1588bdce0cda5d29c5 SHA512 643762dfe5d82538321e0756690d201023ca35ed94210d4e11b2092caf68b8bffa5a1c07ddde0ef67a3db4cebd531427b4efba217eb50c810aa057f696c8443a
+EBUILD restructuredtext-lint-1.3.0.ebuild 782 BLAKE2B d55ed45b8803ef7e332a6bf68a434f4212552d13792907e2b8401e12ba77d32c1a01b40a211e7efbfd8bbff2a82c35fff81b06dd0c140ee83544d604506527e0 SHA512 3829094253a7c7d1f48474343488c8b4cabd798ec09ef20a483a05ca48647f9914f0db6942ec098541715a16eb01c8abe3804f32435418bdc0a5c12d688768b7
MISC metadata.xml 338 BLAKE2B c30f38fd31f802cfdb9dfd57839acc4269c793aedde4a2c17e937f62da0f04e94ccf2cd309b528f9c5753fdc747951ace9fd27a403d32907751ca1640955a3e9 SHA512 50f218c3b3fbdc1b639de1fbeb5adbcd6b6864027331f4521c4d52ba5a66d7ff98b75f746ce29dc8fc454ac8d3e12012cb53e8d8b0b157813a4b359d27760265
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
index 7821756a7efc..242393a065d7 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}-${PV}"
LICENSE="Unlicense"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/retry-decorator/Manifest b/dev-python/retry-decorator/Manifest
index 35c88ad1ad1d..2372788b8124 100644
--- a/dev-python/retry-decorator/Manifest
+++ b/dev-python/retry-decorator/Manifest
@@ -1,5 +1,5 @@
DIST retry-decorator-1.0.0.tar.gz 2835 BLAKE2B b04d127ba3d357a61fb5e35a63867b297834acd82d0d7cdf736a69efe95fa33a263309799dcd4d8ae42e72ad5adb12b6c52557a81413ee8ebc49f5e0e728fa8b SHA512 f650740dd6d05010b7418b4d5ae7351058eb4418dabf7329390eaacceb72db60363bae8ff0bb15284301f0b5bfd9bfb731e71fdffb7231065a4db7ed6ce86da2
DIST retry-decorator-1.1.1.tar.gz 4466 BLAKE2B a64836bba5620974e393a952544c82074b667a5fac80d6944069bf88e9162d03cc48cfe511f09476571c46561331576a2b06b2aefd087f905f968aa8257a596c SHA512 2241b24a02424905a2f3b7660c7ee4f6cd034c67c5019cce54d38ae250a9ac9e011fe323b25254bed051a0d3560d48ecdf4e2a1ee84cf2d7c5b1c12dea2921be
EBUILD retry-decorator-1.0.0-r1.ebuild 535 BLAKE2B fde6bd53e466761ebef3603d9d799f14a2d2ba2f3911d139fb949390941796f94695ca68bd6d10a7725cffd3c18a7ba862affbfaa23bd897e56efcd0424f98ad SHA512 04bd1ba82cb187ba68e878a3b4c2ee7600ba6187fd109942934365f63f4b77a0c0e4af092146dc56b56020a537a7f7e2d09d1cd8eaf31668f34ae262b694d935
-EBUILD retry-decorator-1.1.1.ebuild 464 BLAKE2B a90603d5c53c1d388f7d78a2581120e30e811ac8fd335ca358489cb7f7fe7b3bcb21d789964a26b86c7a9a5661360563ca543d390552ac29d971ea483614ff82 SHA512 34f47a88fa2eedd39b69014db81f581821cd8bf73716daf9b38aafd845932d62aaf894da0c171067568f7644fbb8b03c73841c47cddb3a4fc9f47923820b914c
+EBUILD retry-decorator-1.1.1.ebuild 462 BLAKE2B 7d6c767473955e460454cdd057e910484e5ba05d2c7f551093612d436dd53b4cb88558d3c8fe213d691f7f33fc920e8b5c4fbfb27280e2e3b1961079d06126c2 SHA512 525651fda9553d4ee27505abba222e2052b6e32d3ac8a5ed857eedd082eec09a43800a7f1b46bcacdd94e4ed2a8f2a29c0d55b09ae5bc8692c1ef286fb1dcb0f
MISC metadata.xml 337 BLAKE2B 29715a3b27a3e28df0232103e6f826dc37f91a4ca981b25b3c4a786beab1c242db13fb942c1fdf0d646567439f7221862ff50c77ed87d376aa6ed6b04686434f SHA512 b94863fbe276838245ce8de2206145c0a0953cf8ec520ccab8dd4c01d6a58d191740c7ea1af0c1692567f41660ff009a5f5cc3147126e21299864d5957c979b7
diff --git a/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild b/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
index 2903f122c5fb..8b25b6b0f21a 100644
--- a/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
+++ b/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pnpnpn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 arm x86"
DOCS=( README.rst )
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 45ef009beaf2..d3a6c78ec74b 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,5 +1,5 @@
DIST rst.linker-1.11.tar.gz 12569 BLAKE2B 5418f651322c28d8aff2dc735f8ff72325e895d8f2c12dae4985112112f74023c6103e344f4422e944b32b692713834ae5239bc4193edc76bfa85d9e0a674f4a SHA512 8e748330f60e2e1f859fa3ec3fad706d7bbafc78a402b0df242bda7caff1fad3f1b17873fa9ee749d3d214e094f24a35695c627cf9a8d8f08ca99ee6ad0e4e6d
DIST rst.linker-2.0.0.tar.gz 12861 BLAKE2B f52ddab3c8119f0bac64e294e4a5a3cc50916f19f49ca1ca4983d8b5d2bb5401c6accb5873df38609386e12fcd1cb02b867f3633edd4d10606a98936e96e62eb SHA512 ea9fa95de66c95dc384c888446512be66b180d0d76e99fe7a6b8f8348436d4be959d3d567fa521d9fc925b537467a4fdf05f9e9d17f7a6df4aafd6dfd323e4fc
EBUILD rst-linker-1.11.ebuild 1501 BLAKE2B 55fd266a6db1c11db22091f30b0e181350d1ec4eec90fb8959955b64ef82e6ba615a8ea3f7835e60482fd9b2a03faf5b433c58a1be177699dcc2131f18c81eb1 SHA512 7cb549ad0eabee7fc784ad50c612c951a7a0b0debd4e0a0ca896b51732fd6122f8b76f8263f3eec1b17f50c5712b6e4e162c3dc41aa19b046c5f22f278ee17a4
-EBUILD rst-linker-2.0.0.ebuild 1345 BLAKE2B 120f6f9416ce03fdef5b2724975a586d38e0ee17df03ea9914bbf1be82354becdd9984ff660f8ef960a0b993d92287d2a8a9ed6e96869c9d499258b1a0c1d6d1 SHA512 a9dcee060b822fc1a46a4b75c5fbd8c9c1d06915b14a0f232943f1564f630b170d39adb36baaf20614cfadbadb50c1bd6ce1179668eaa3b46d734cbf922d241d
+EBUILD rst-linker-2.0.0.ebuild 1340 BLAKE2B cd6fe2f1147bd4eb291ab86711fb9dc287963b6f32b35743f315b5387d8158eb933e05c1f8782b5bc1fe16137c95facefdc3013540411e3fa2f1431843a9027e SHA512 004ae5b68636f0f732bb0c4e9b0d6abe9c2203aa4a0d8e838851cb278ad74c9187886f62b59b5881b12e881eede862129b6966b3772c18c900aba94b27b591fd
MISC metadata.xml 440 BLAKE2B 01a949c99d2843942dd04dc1e3834552dd8b289a776d66acc4247c33064dd7a5c0591504a0c347558788642719fa78db8b95b5c5c06f12f5eb223df8f2343fd9 SHA512 6adc5406eeaf65eaa92644a56006d29909ef2e3cbf41753968d3efab6364a7d41bc98d9f03ed59a1f4c6ee8d2f6b4c75fa02103d04d4e9f065764fec6c0dd9b5
diff --git a/dev-python/rst-linker/rst-linker-2.0.0.ebuild b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
index 5986d16e187a..50473ae3f811 100644
--- a/dev-python/rst-linker/rst-linker-2.0.0.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 87277784b036..21b2cedf36a0 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -3,5 +3,5 @@ AUX scikit-build-0.10.0-skip-sandbox-violation-tests.patch 4606 BLAKE2B 4e563ca2
DIST scikit-build-0.10.0.tar.gz 132443 BLAKE2B 7e817b1b6d8ea5e663cec59c5ed51b3f58318eedf6587380eb2a1458bac772a5a02a936015027f1200f740884ba33512babb1aadc4cdbb59ea38f46bc36cbb5f SHA512 cbdc59a41c60c162be84b38d207838d5e38898871f2ef02dcb672796f01f7a31645892770172e9891a4dd7aa02a85dd489b6dede4c5f717ab013dd8947d5d314
DIST scikit-build-0.11.1.tar.gz 132025 BLAKE2B 0f818d8da896695ee0d6b046249e74cbd4ea643bec0515d6ac6ff4276d92430a1dbf81abb3b7c10890538c373225a45cc21b0906de891f1a5390226be914dacd SHA512 030c6cc727d39cbafd2865722de9c45ba2f13461461cf75019b9caf6afd0a776b4f598fa2ce102b5adbc770140ab1de2c33e2bbd3ef03c958ae8849e5fc26cb4
EBUILD scikit-build-0.10.0.ebuild 1165 BLAKE2B 50ebd4a84506a5e7e6a10823c1c7a9bf94269be6d951a61c574576e1bb049b4abcd6c28dbe6f39c9d412f43d50d01846f5792cde1d904650d614ba2dd93d2e7c SHA512 75101db969a0005d48ac73a1b530192c82b038611f793c72d9a85f0ab27d5c8c885dab35fa47f57368ba4c5225d5bce77ddeadb14cfb5db2674292b0c695c1d7
-EBUILD scikit-build-0.11.1.ebuild 1440 BLAKE2B d74c225c42df37298d0d13fabfc3c2635c0472b705662d63311c368e683a9dff6729704212e5ade25c691eaf9aba02272eb208be937ab76b075019289986caea SHA512 06259b2703d87fa12a050bcaa2bf0634e63b601d554190d0e61f5a5bf98a6e8e7183f272cecfda2e27f664822f8a85933d235f934f99f899a528252ec9e88bcf
+EBUILD scikit-build-0.11.1.ebuild 1445 BLAKE2B 7be6f7c11ca41b51daac5e03608a8f83e11282d1a722dd242ceb4d945f1e6e161bcc6f8c6a458954829375e99c83b265cc764bbd79be96276edb58f6de88cfc0 SHA512 cc17808295238b3d7db3d068da2c9c36cbcba4223f2cbb6b58ca5d2326753428bd923f6116ffb69710c34a043340b16451c5326910281dd9e35838d6cb5d341d
MISC metadata.xml 333 BLAKE2B e446041c433ac52a0762f0f3624504f95a636bb297a41b098171b3b2d275f8d0214c60fbb0b86e6b892a4953de3bb9bee2f12504671dafd698529b724e4229aa SHA512 635413348c10790f6edb48236dedd4e5e90497b2654aeb3ce344666561d5de3107fb079652976ac54b579ede917aa965cd024ff3c113a5dc885d78fe9cfdaea5
diff --git a/dev-python/scikit-build/scikit-build-0.11.1.ebuild b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
index 9fced16258ce..85e78a7d3198 100644
--- a/dev-python/scikit-build/scikit-build-0.11.1.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
RDEPEND="
dev-python/distro[${PYTHON_USEDEP}]
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 2198c0e151a1..7b14b945f495 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,5 +1,5 @@
DIST scrypt-0.8.13.tar.gz 53606 BLAKE2B 924b870d2dd5d8dc6765ab2679e71a819fb08a75cfdb0e7a6cfa9c305f35a376892e78607007013d9dc7d9a6b2bc6420019f8b27fadc7f468b3b2fd685a1c3ff SHA512 a65e24b0a7dbe02e16c0b38b52c66549f36370e267aacf348a107cb980221806ca783cee0caa95ab6af978dd2b0d8efdb6b06798bb43742d4623bd8f6535e9a5
DIST scrypt-0.8.15.tar.gz 53954 BLAKE2B 9f9bfc6ead25f14b9b3194853cd64a7b2244685d15a7d257e2395b0acf3fb968487fffc5d5eb5a245de1518b0740483d3e6feed841282b40ecec86ce178de46e SHA512 db5f688b341f816935a0fd5a538d8633a1e43c69c7228d9fc127459c9673528f92405170339a5a43eca86eb5a2ea17b951ac16a203993e452e05f2589914a66f
EBUILD scrypt-0.8.13-r2.ebuild 604 BLAKE2B 26890b0e9f2259e827490f4681076d255412929d61b8e1790f6561eb99b1190683c44df2e0052f7fa8c3816ca2ab172c307921c5be9bc6a5ead9ccee97580ebe SHA512 045510e773160a192a01a4068e09d618f25bd82b74772e58566f96bdec68d131dc5cca535a74e09965dfd44156fc63fd34de9a72a73b3df8be25f1c5cf30e1ba
-EBUILD scrypt-0.8.15.ebuild 608 BLAKE2B 2c0bcb42b4489a580781f45a7137ddad465c80335055bdf7a2a304a1fbfa8903a57b82608eff91b587f2428a8309d7e97bd5c13a0667909de4456ce469b06fbd SHA512 7bf524032a6a974e2ea05be229f522a0e4bcf2ca782beb2c0e2ec9293ebb3cf34766418ee3d594f78afd8aed8caac049162e5cf558913e63fca4996f89c63015
+EBUILD scrypt-0.8.15.ebuild 605 BLAKE2B c1cac9e44b68fa81e500c0b327e2293c3ea89e7636a33866fe3f363f7ccfbc33e59701eb6d211f2bb243fe9d8c41165fec3ea15ca0eb29799c4657bdfcad33fa SHA512 a55507eb1362c83e35584ea05a3222365715da310dc34d2a275bfa1ad894e55b1c9590b7a04c0fe35de85a40dd30c767965236b511bc0b5e7d082eb8d248c04e
MISC metadata.xml 479 BLAKE2B 699d8337f530cbac981bd6be4556e75e85874bed107100eebd605d3dbe01172b85a66712c7d20bbfb4310d5bf6d32df97bfe47132334ab2239190818b2fd3fec SHA512 43f00f2f4910b07e5f9db676cba1527b27f5ae4bcd49d59d118fe1e9656f185bb08535c1cc04f95bce6b59613c5b022440d746033efbbc3c26e3ade81fadb56c
diff --git a/dev-python/scrypt/scrypt-0.8.15.ebuild b/dev-python/scrypt/scrypt-0.8.15.ebuild
index 3c8fb67edbd8..f7787cd374b2 100644
--- a/dev-python/scrypt/scrypt-0.8.15.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.15.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/holgern/py-scrypt/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
SLOT="0"
IUSE="libressl"
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index 2a24243b3d57..eefbd1bd6100 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -2,5 +2,5 @@ DIST SecretStorage-3.1.1.tar.gz 17036 BLAKE2B 1dda10a5f74727ec29392ff2a3ec65b841
DIST SecretStorage-3.1.2.tar.gz 17848 BLAKE2B 3d108f98fd0c26958860aa65554a21924822a5d51a90ae20c5496792f4571babbdfd2aec5b70d1bdd908498ad1b61606130d5db2900406ae85f8e3367ad3013f SHA512 c132b21556c55b5912354fd27b6062d32c0f510234f7fe57f6e8e0acb08393ad95e0896967b577de97821387cd714e62b657359230296449e4e0a7ae5a797803
EBUILD secretstorage-3.1.1-r1.ebuild 902 BLAKE2B c25c43653eb02e9263471876f07a14c4ac1c4cd8b63a5e1309f1fb17f633ab10a9ab126435ac022a4820b4fc9a95a7cdad89810f139c86e04c1857cc4b4c5738 SHA512 b091db11d231f939ff3c5f6f9350cb863f65d658ba1989c868dad3505eb804438a5c319c9dc4b64a7d4247ce33b17f9da22985d685f414f063404f34c1a59624
EBUILD secretstorage-3.1.1.ebuild 1092 BLAKE2B 306a34a53d76d868ca010032bd6424158fa9775f7100e55eb2ec33acf53b3afebf76310c023eb55df64f4ab8b6a10495fad57a24ffb765496b3de7b4b9b1be72 SHA512 c123dd74c6f0ed3a29f6c0c165c4ca9a7a998de27ceae12cda2b14b7372c8be7aeb00933c2e5c96d8cacad04b85bbded7ffb1923af7849343669ed26a4473c95
-EBUILD secretstorage-3.1.2.ebuild 1146 BLAKE2B 4c654901e897ec1f95783071c0f6c79c30d80e28773d44bd4c77b912804b021e23741ccc0fd3e7e4a0e4da79a0536637f8008b04e61c5d2cef1e66c78e63ed0b SHA512 93c1da70864ab15d70a226ea5fc973dd5b2cf3f6c323000b0978e0bed2a65abe2776e7c21405a85007c03fa7aba706b129306e83721ae395a1f86dfef9fe14ff
+EBUILD secretstorage-3.1.2.ebuild 1145 BLAKE2B 6a6b71b39b02e0808513340d945ec915d11e9f789d806153b914e2d2e70830aa7f880c8a1709296c3a309a97b406ba35b70759ea8cf16374c7d9bf6447d6285e SHA512 3b41c8bee0de571d5610a1207f05c774cd36ff733ce7eaa1b0497e97c91e2c6e1185c44c5d5690be0d627ebdfa9143b2e7dc6f38ef100877c0082935673a6344
MISC metadata.xml 377 BLAKE2B 6401f07923ff58cc70bb0eb9d08efec05924c5b74102e1ff2e9eac0d1f2dafc1f4ef8e31f2434344ad25a6f2ee71061aa23c232d23214d91c4ce5c7de437da64 SHA512 56c6fc8a7b58a5ffa5e2d705567203cad260629bcf8581203be8ec2480a16603334e3298583c297a8e093881955fecd457b250af56bac05871476041d217bd95
diff --git a/dev-python/secretstorage/secretstorage-3.1.2.ebuild b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
index 571eb1a98f0c..16c2b55f5472 100644
--- a/dev-python/secretstorage/secretstorage-3.1.2.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 42a12fb714da..60e91ed58a13 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -7,7 +7,7 @@ DIST setuptools-47.3.1.zip 869963 BLAKE2B cecc4d43ce09708c2454c20064baf8b5597aff
DIST setuptools-49.1.0.zip 2170689 BLAKE2B fa5f9a8955ac4206396c653a3c6b5926aeb7f6f4052de7b67698ad39edd3d49c7bad13bc65720b5a40a906d06eaf3e6918cfbc20a2a59e100f75400c2caa17df SHA512 a5734742a6d2409f41c62f29dea35c58f480756ef8a66f70aaa607a6927a64487f92d20def6791860ee508e713b44d800e41e2cf8b5abcffd7e1ed1058374efe
EBUILD setuptools-44.0.0.ebuild 2241 BLAKE2B 01cc0eac39c495e27d0087f9c130bded0685753fb030992115760fb62132d7e319a530a200ba8fa65ad13d28f23ffb1428358d6d56803aee6a583221dae6c15b SHA512 6a444f1959796ea98e8c59c64ec4bec06b609b8fe425e827150626909a95fd2e461f02179bf03fc3e200bedb3274a910cf8ee816c21c8eb698a17f44817bf3d0
EBUILD setuptools-44.1.0.ebuild 2241 BLAKE2B 01cc0eac39c495e27d0087f9c130bded0685753fb030992115760fb62132d7e319a530a200ba8fa65ad13d28f23ffb1428358d6d56803aee6a583221dae6c15b SHA512 6a444f1959796ea98e8c59c64ec4bec06b609b8fe425e827150626909a95fd2e461f02179bf03fc3e200bedb3274a910cf8ee816c21c8eb698a17f44817bf3d0
-EBUILD setuptools-46.4.0-r1.ebuild 2293 BLAKE2B 4d6a42a993a519b0f90a8d529bd0ec8799263e74794ab538a39faf4d474f75c708f29c027d62a5a878fca9cf21cf12e003d78c7642f6a110d1b7eb203efc2306 SHA512 21de8a47bc034e0f46f067efd4b90331880a1c7ea54337a6bb14799a833cf3826343af593b3ccabb4d73fb87e2b5e41a4fd8d37d4e87f0738406be15f4de1a75
+EBUILD setuptools-46.4.0-r1.ebuild 2290 BLAKE2B fd215d7b912e6c0507013a4235ff7468fd34811dafc6a1997a9e5ae4d6dfe1bf7e62830586543f59820bba213a55aa459e6cac753154fa546068bf27211f7343 SHA512 2ed17c606313a94766f5fe38dea54fed8bc49ee5f8afd36846926f33613421f034a4f67aaedcd9eba894e68f25ddf4a3f559c9332dde9122407a3bf7ac57d5fc
EBUILD setuptools-47.1.1.ebuild 2028 BLAKE2B 2a0313f4a65f1f17197f84aeaa3e6e621745fd9519d7e17c2129f8d4dbeca012314cc0581f6e424661b49785089227916647d1d6c74e41711dd0ffabaff09e26 SHA512 08d9dc257cc2b947064fc8cc90670017ae07de722624986fe2fc55b627397d63d0701a4beb0fec46383473b1f69f928c9b313510dca61270bb52fae4c196e946
EBUILD setuptools-47.3.1.ebuild 2028 BLAKE2B 2a0313f4a65f1f17197f84aeaa3e6e621745fd9519d7e17c2129f8d4dbeca012314cc0581f6e424661b49785089227916647d1d6c74e41711dd0ffabaff09e26 SHA512 08d9dc257cc2b947064fc8cc90670017ae07de722624986fe2fc55b627397d63d0701a4beb0fec46383473b1f69f928c9b313510dca61270bb52fae4c196e946
EBUILD setuptools-49.1.0.ebuild 2043 BLAKE2B a3ed7a61eebac6fd12c831d2d5f28735ba984b1522c3db39c8608615061b00e10df4601c34dd1d1cefd6870ef997afb2fa025a5ad1783dca1f50eba3bba9cfbc SHA512 985b4e11bba757e58aca75659a32fa7fe0923ff36b0437b506b6e99434ff352968e24d4e417c49464a915fac27dd6585a593de021d172112cdb84a13f484acfb
diff --git a/dev-python/setuptools/setuptools-46.4.0-r1.ebuild b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
index 7a1e7a2fec02..3736b438e250 100644
--- a/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
+++ b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 8c3b5cc07c09..5d8243e3babe 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -5,5 +5,5 @@ DIST setuptools_scm-4.1.2.tar.gz 48784 BLAKE2B 258fab119d3c37c17bd173e4ac34d338a
EBUILD setuptools_scm-3.5.0.ebuild 1116 BLAKE2B 9db6626cb3b863e3c124cc7a7e62cfbfeb0b2adf2467c1584503eff8af76d451f6ff68509cf222ac801bf2e35f68b61dde0b7f486f3d5d6cfd9564cdb835cf20 SHA512 de6c02fb68607524ec31fc9d053249cc8f5c05c010d64915cd219c07ef6932adf3ee809f3faffcd5300fcfd93b3db92747c793ac0c5cf541dbb6237967872662
EBUILD setuptools_scm-4.1.0.ebuild 1137 BLAKE2B 2175d482de3491587d1d01effd26bc59beb236128c19227a704d3753baecbc600340d28e56449a85c4d52e0ad8a4d9b6283da4bad7b701de65ae98d3d796a53e SHA512 90439215b2972e888653ff4062425f03f30fdd765c312fa7c652d9fde88267571fb51aff7e189569277465268c09736a3e21378ada8e8cc3c8f7c89fab34674e
EBUILD setuptools_scm-4.1.1.ebuild 1137 BLAKE2B 2175d482de3491587d1d01effd26bc59beb236128c19227a704d3753baecbc600340d28e56449a85c4d52e0ad8a4d9b6283da4bad7b701de65ae98d3d796a53e SHA512 90439215b2972e888653ff4062425f03f30fdd765c312fa7c652d9fde88267571fb51aff7e189569277465268c09736a3e21378ada8e8cc3c8f7c89fab34674e
-EBUILD setuptools_scm-4.1.2.ebuild 1137 BLAKE2B 2175d482de3491587d1d01effd26bc59beb236128c19227a704d3753baecbc600340d28e56449a85c4d52e0ad8a4d9b6283da4bad7b701de65ae98d3d796a53e SHA512 90439215b2972e888653ff4062425f03f30fdd765c312fa7c652d9fde88267571fb51aff7e189569277465268c09736a3e21378ada8e8cc3c8f7c89fab34674e
+EBUILD setuptools_scm-4.1.2.ebuild 1131 BLAKE2B 6cc2167a305be1f8a2ad5c707f13bd597f4317a44bba67c8e48e0da9d0ae5fb9f8aee0f61ad1ab2c6074658289c138941aa7e579982a46eb028867af0a019beb SHA512 4df9551f69abea6f3bb429ef8dc6d719eb698cb2f07e78a638322caa21ff0bf10de92eeee0931f9277d7dd93d6c543a9bfdd90a5cc360487e5430dc7751dfd43
MISC metadata.xml 462 BLAKE2B 257bda789df46f229831124349133582141ed8046ffe22a2ed2537562e583ca694f9a23ac8fb70a8a7efec1414530a5b16db73568dbec22cddbf791797a1c781 SHA512 1118b7d883678dd5cf0c80bbfe28a926172646369032aa54b634dc518d617754482ab35962a3647aaf88310c7abeb17842d4d98b431a7bea0d0780112d06993a
diff --git a/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild
index f28a4689c959..bc5b3d0b25a9 100644
--- a/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index 3ffc0dd6ad3e..0195eadb1dbe 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -1,5 +1,5 @@
DIST simpleeval-0.9.10.tar.gz 26687 BLAKE2B eccde3c580f65bc22e88711cdfae4b1d6509515d674d62bab501d1cdc5dc1e91f76d391441e012f7fa51221e2c807b831dda05e7b620303d0845b5032b1a45be SHA512 50710221b49ff618218375d6d9b4eb9ee12b875ce0cdaaa63e2dfcaa112918f5bfdf8f02bbc3b5be98c7abc312f99563d910985bc5ad86eb846df935fc072eab
DIST simpleeval-0.9.8.tar.gz 24554 BLAKE2B 92adb2de03e2e70be99adef625de54c02c39305475f8df4517862c9a2726ef5c36e3e411f6cd1b4e47d57ed20ce66b3fc55ef402e705c4f3d49b8b2389919e18 SHA512 3aedb78571442283bc7b2bd1754dcc2197f81b264c6e629acdd8307a0adb7a4f06e084bb121caa0c36711153253b884942cb5c50614afb58e0e895247f8c20aa
-EBUILD simpleeval-0.9.10.ebuild 514 BLAKE2B e01d622c9c0a1c2d8648c6f1fc40dabe395ab9b35b9e6e4d32be2516a939da2a701d15d55bd1793d6e3c0ff94a0487572df0676b773984e0591d3d26dd4c37b0 SHA512 fca490c1d49dd2fb41184f2d9e30324ff0f68f90c9453527135c68702127da5072470f82018301cfe7e998b27666bd24c3f0f68323f92bdd3d7c802ed1a123eb
+EBUILD simpleeval-0.9.10.ebuild 513 BLAKE2B 570ff9ab208ba7dbce43a7576e35aaa023426b11a77ddf1e42a71e7023c38cd69f25f52c3ff35db8b09bdbfce6ab767e125f608782bbaf0ef1950ae4a811ec83 SHA512 fc9c4739d40ef81fff74d3367648226ceb80e9561603367a045da4dfc07a39206883d7d43941982d03428742f2ae2ee056fa82b92964dc762c2ab2429b930db6
EBUILD simpleeval-0.9.8.ebuild 510 BLAKE2B 1d2c41c755e70df8031b1f498bc7661bf00e90bfd44359de445be0b3a434c11a4ab7a4859a39511807398053fe37c36c5018efc4c9276b9b150726f002ae4c64 SHA512 55d5c26a9a078096c0c76af8dd85611fdabdf9a2c8bb5f05dfad93cec780d7df90a58bea94bba77d237ecea9517e5484f1f33d19f3cb7250144f1d754d0b17c8
MISC metadata.xml 483 BLAKE2B 5ca6ac5ffec78efa1b4c14df21173e15050efd7a024d87cbbbd86e59835afe2dabd4ac44c277a23276eed79dbe889f0f5a5a514048aebce42aae9c46f8d832f0 SHA512 a2f3d2ad7fb0d4d887022003498692c18db8e4ea6de1f5c5eb2a10e48af624a887dc2a06d91a73023c17a2fadb52e30e9e14b9686f0c0d73b60b6fe35ac39222
diff --git a/dev-python/simpleeval/simpleeval-0.9.10.ebuild b/dev-python/simpleeval/simpleeval-0.9.10.ebuild
index 082108d43d4f..44b583bf782b 100644
--- a/dev-python/simpleeval/simpleeval-0.9.10.ebuild
+++ b/dev-python/simpleeval/simpleeval-0.9.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE=""
RDEPEND=""
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index 77b6484bcc50..7e7eb70c355e 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,5 +1,5 @@
DIST six-1.14.0.tar.gz 33857 BLAKE2B 711ef5b79118c1280c9868688869cc475668c248e6b0c2061145818842d5b4c28809d86b1388709af24f6e92fe5926ea6261f1b85c62db749f79664cbad93e4d SHA512 4dea0f4e7961e8b582d665501c65852dc3b73516a0b6f78b0888c8670f1450df58bd3eea418777f41080b842ab6c3d8633be1034bcf920192e5590d5316e2c9e
DIST six-1.15.0.tar.gz 33917 BLAKE2B 57e852b6c35dd19e256814c0371cfbc26141b0f25a31f79a1cbd1b0cdd7d3cacf1236b96f5452f968cc426e6dff4d1ad70a9f2432bc361ba3c8c17fd40fe7582 SHA512 eb840ac17f433f1fc4af56de75cfbfe0b54e6a737bb23c453bf09a4a13d768d153e46064880dc763f4c5cc2785b78ea6d3d3b4a41fed181cb9064837e3f699a9
EBUILD six-1.14.0.ebuild 689 BLAKE2B ff4f54f7fb3e48bbea4fd2dc414668e95cd55cb78ed55f91934e304de9b9ec95b3c70e60e144aaaa36d39ac8351f324293803deecd35e8b13bf096435e39a499 SHA512 3b89249aff7ee4847e88a3343096ec4cbf5930b16c1dba3d9dce77a8359157e7c2c45d2aef508d6a34d3349a1ef5973b496db898478339bc16fdbd7f574e8159
-EBUILD six-1.15.0.ebuild 700 BLAKE2B a3d6710773c64fb242887345ceaea95ad8c88de4d43cdeb2d73a7f31e76dfd6fe87e24c40877a5e5ca1d2ef5fc5793d5b8b9254b82dcdb79f2dd8a6b66d3b443 SHA512 ea9962f66ae2732c681f30d1141d8a49ee30d44ae26371fbf6ac5cb2808784b5d264476e936daca2b1089daccc9adde3dd8e70c431f619904c634b595c56bbd0
+EBUILD six-1.15.0.ebuild 695 BLAKE2B 93161790ccfe5d05c899250d9f215948a7b762bfeef4b106d817f7b993703328a01be55894d046dd59d7c5e88a1b6ab64fed62bccff8a900d2024a877d41aecd SHA512 2baac77df821456056823ae784569102055c90764091fd68e8e17ca9cd1855cba3aa63c48e3e7632415d5f28bdd7fdb342d580e62ec3e58d9b090ee5c3cdf8f8
MISC metadata.xml 396 BLAKE2B 4b08f7faa6e73dee9d4f39caebc0eef9901f408c1cdfe5d883b350af406de2731e654c2a1c266daf07299451f57b8a717214ca1716463f7f43b376a51b4f6c2c SHA512 03881122a5eae7539c27d078eaf69f34e121f3a8a43c7e0ca9470c0ec6863ea268b5facc64e0ab100cc6b8c00473f784042047f077ceaa7f13d70d71dce03391
diff --git a/dev-python/six/six-1.15.0.ebuild b/dev-python/six/six-1.15.0.ebuild
index cd8f4891597e..18d6e360909e 100644
--- a/dev-python/six/six-1.15.0.ebuild
+++ b/dev-python/six/six-1.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
distutils_enable_sphinx documentation --no-autodoc
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index cbf2bd3d90d1..6aa03fbfdf51 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,5 +1,5 @@
DIST smmap-3.0.2.tar.gz 22511 BLAKE2B 26aa528628d9f923b883481e635292c7eeba70d37c8258dd242a5ff875ec4627c57c753e4ce72de6d19ef7227540689b6c410d941079ef5c1b279c30f65e50a0 SHA512 52db538f16b9d0bdbbb932c7eb67510facd0638ea69dec21e9d503c3381195130ac0bc1f48db24ca76b8e31b07279799a767dd7e1bf1d755e7f7684f3285b8da
DIST smmap-3.0.4.tar.gz 22459 BLAKE2B daccd2cfa4d448297d1a0b2c33c1a316e8c84ae5dbe934d688fbdf034a660214c98d428206b8e9ce1cab3e5f3561309a1e7f29e3371b7358954f0fe7ea37092d SHA512 da7e5c0257f29b487eb5ee18f29656340f7f6999dd625d93560444d526df8036a8fc4452242a2d01203907798709d82a0015709e097bc22acd3d0a8b976ef9fe
EBUILD smmap-3.0.2.ebuild 465 BLAKE2B e298af1fdf3cecea7bb88d9dc57a6c053b3c292a36e68f314cbf27fb3a4d74a26ff8b36a8f05f42b18e2f75fd3e80356881a24d56692a1d16219cab6faf4bdf0 SHA512 7510bba2a28d9d1bf54bc09b2eb4a52532dfb6d2d9627e94cf9980e4b3ec0ca631dd6dafd368d62358b22ea04160ba49e3f4ddf6cf524d65e2adf8381db37bf4
-EBUILD smmap-3.0.4.ebuild 467 BLAKE2B fbb4d7c7f7004dc6e7bea9ad9ccaf2c85824f88da61a5a6f947abadd6ffa6612291cba75cfda3bf54d231049c365acb51e11e8714aba8aa9dffdb32d702d3c1a SHA512 4e9045bb8ff5f83d023ddde1815f294e085703c6688eb6e687e31f0e2e34f7d3f7dc80bd7800d9e9f1b8215b6b8610eec771a0d5775ddce4939735d9cbdb06aa
-MISC metadata.xml 371 BLAKE2B 3e42cbd127ee25fe4e316797aed0977eab484119096a606b517fa8d57d2ecbeebd4c4b51570dbda7771d1b9bf6bca368b5fc97379f08e2c1ea51121628d109d1 SHA512 9f6f41b53acf58ff0b7ed064469b5b66820f6c173b657ce59d9501d78f87ff2667b84bd0be275f6aa2d06752d875c5aba83105f5414b2b50a86fce9008685f3c
+EBUILD smmap-3.0.4.ebuild 464 BLAKE2B a9a0c1aa02db5a4e7ae87f4f27117a7eb9860149587d0bfdb38e34d84648bbb97e854a68a6636c17b7ff141f46ed0b9f5cf967c6518e0697ff746dbca397a889 SHA512 9a30a29ac2a9e63109f11c486d80556cc1de4649c13ca42e68213cfea21e96e2679a803c2c82edaa766a9acc71f41cc86462e32d2ad55c66040c4ff716f4c53c
+MISC metadata.xml 396 BLAKE2B 5c97e05fa9c1976fc6f12f6a4ea3bef317876c1f329ed31d5a6ddec7c5fb177cabcbc80b22532bfcec545a5847e58e3605f39e08d2a1ed80969da5dcbe3e2a93 SHA512 c26a7a644c3cfb8c537dcbaa5c031cad1ea2a4b085960348be069376e7bf9b4d402b0f899091d7fcedaf7f578d457e39bed5c993d0e394e466430f49fc86ebf2
diff --git a/dev-python/smmap/metadata.xml b/dev-python/smmap/metadata.xml
index 3aaa661d0ecf..f90c32a7838a 100644
--- a/dev-python/smmap/metadata.xml
+++ b/dev-python/smmap/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
smmap
Byron/smmap
diff --git a/dev-python/smmap/smmap-3.0.4.ebuild b/dev-python/smmap/smmap-3.0.4.ebuild
index 90972aeedae0..64dd85dc7151 100644
--- a/dev-python/smmap/smmap-3.0.4.ebuild
+++ b/dev-python/smmap/smmap-3.0.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
SLOT="0"
distutils_enable_tests unittest
diff --git a/dev-python/socketpool/Manifest b/dev-python/socketpool/Manifest
index 57b80994e6a7..602c47c3df75 100644
--- a/dev-python/socketpool/Manifest
+++ b/dev-python/socketpool/Manifest
@@ -1,5 +1,5 @@
AUX socketpool-0.5.2-locale.patch 615 BLAKE2B eecb66a15dff1ca068da3147b7e27618f49cb414e34a27b10949565dfac46f5b714bd00bcfc152c9d3b98b59ae4282fa5431aff61295086abcf0e5367f45954c SHA512 df27a0b1cc8ef2475ad8c68e3f77153ccf5397e962bfae2f6116dd37d1ad3a1a45cfa0912ee4d4597560004b8875b609bb8b0a6298861651ff23ff2e70955dce
DIST socketpool-0.5.3.tar.gz 9793 BLAKE2B 89b7b71d9f05f7f5e560eb3cb5e7cd4d2254ff971066d236b98903d790dd96f6c580333e9fafeab7314c50f499c9617df706a20efa1c52de069c583b6dabd928 SHA512 6d16a18927672157703fb5a29f4332241f9ddf743dfee8f2606d600dbb75d547f2e0dcc0398febe55df3319829a80b3f537b5877679e4f674569ef55de78c1b7
EBUILD socketpool-0.5.3-r2.ebuild 1264 BLAKE2B df47285d2e83bc22500c18577d77997329eed569a6c5ac6d769599fe4343e666d27ea61a4433ac084fff5ab1ad37f81ae80c0c43686d2c91e4c50c33b6472cba SHA512 4b5fabf30d93ed2c1704881bad65d40806e98aa614d9b264c099a922747df64629164c4c818e0d5470b3a270cb82d85d095c5fa8dc926915cba79435170757e6
-EBUILD socketpool-0.5.3-r3.ebuild 1488 BLAKE2B 9f92eead8a705f3896520c24c26a3b9747b362f7225ef81860ae5f118307ebac1de48745ee6ecd18ffecef1988ebab3671a038d871c2583149be7f9fc0483118 SHA512 a6d9e284ddc1bfaf695a4d2dc5c44412baadb935cd93338ab9316c90c5ee9c1f34192958a78a8b819d6dcdc3ef078dd658b1cedbdbcac908db30ada1894f9181
+EBUILD socketpool-0.5.3-r3.ebuild 1484 BLAKE2B 45daa00c91492827f43a4f2df689948668710ac58ed0d6b8a1ee7b85b5ea186bfefed10d69e015ff66bb9940173ce66fb16f3212dc84bd3a1a0888904d4b28fd SHA512 e496d082520142814d589d708475c37164acabcd8f67b43bdeb9e6f1d77eb851d63a99876e32808b3a4f8dd98411884ee5ec1b5c964aea3825e4755dd4b5f810
MISC metadata.xml 646 BLAKE2B 78d8d0ff3cf4c225a6f36e02c1ae604b2bc7274d2b3d1f5b13dba09e4111ffb1177cd9008b0841e1f22a5a77426dad7a6f7ff39b9475c7944e8becfaecc1499c SHA512 e0845d25b7c518c035e44094d6164d2184556e8e4c82691efb8c79401835a924ae3aebc271e29c756169bdcadd3a1b9db8fc8666aca65d79f5c10ae45848e1c7
diff --git a/dev-python/socketpool/socketpool-0.5.3-r3.ebuild b/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
index ec04b5041af9..b3454edf19d2 100644
--- a/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A simple Python socket pool"
HOMEPAGE="https://github.com/benoitc/socketpool/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
IUSE="eventlet examples gevent"
LICENSE="|| ( MIT public-domain )"
SLOT="0"
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index 1af2db953778..542f88a7b13d 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -2,6 +2,6 @@ DIST python-sortedcontainers-2.1.0.gh.tar.gz 9220860 BLAKE2B a667fa817f0b240b8af
DIST python-sortedcontainers-2.2.1.gh.tar.gz 9228694 BLAKE2B ccbcaf8ef1582c3229cfd82699b642c9cd86db69f68cca56d35fab05fe6b8bef5281af53eae3b697b1a8d7aaad9140d2f3de611eeb5774319a64ff9c5fc602be SHA512 d4a45c4db9ec86c83c71506525a452fd5716818326635f69fb6e830d86803c5d39821678cb67e142ddd1ae9d093f9bb583c29b6bdc59a18a5ec0213eea4a1e29
DIST python-sortedcontainers-2.2.2.gh.tar.gz 9228894 BLAKE2B 358a2028a00748c89046069ed7ff075350d4a93f98521b48a72ba466719fd8b1eaa023f4c9d93beec1538315518f7fcc8b5b02478b1506c65fafa3840081b668 SHA512 413212aa35a80d24ec208caf19314dcc42dae207ec4ea8fdd7dc240c6fbf17372cb4c3e2209f6e40094419fa3eeb2fc9b23ad8bd7fb4e6fdaca46fd2fb248281
EBUILD sortedcontainers-2.1.0.ebuild 825 BLAKE2B a3913f1d4dd1baeb62677f7236263f29fea4397b137a87b14874882d00d89cdadfed5620caf564f8722c4e85713ccdd2f56b7e79c52202d69d9c987da5047500 SHA512 d097609523f7e5e0ce8d685bfbdbe98708c2695376a2a99dcb2ea17ae7e4a8384f1f3a0c07c0ccc1ed2289b1cc6140ee4d59b2f470ac6971fb7c040c5adf8e82
-EBUILD sortedcontainers-2.2.1.ebuild 831 BLAKE2B 1b1040594f4c8d2d769ab92b618f8b1461100415afd968d9243cbed1f1eec90865af8a34b1befcb4e8feb9ce279914c09a2c354c7030f1c16a6e21306943cc81 SHA512 e609483ef63ede55654ac47fc83c4b1f7722da95961d5a4e457332489800477a56fcdcbaadafbe43e9f6479416f38a408adc55271a392d7707fd2dbc0a0ffe74
+EBUILD sortedcontainers-2.2.1.ebuild 828 BLAKE2B 6361405ef8404dfc6d8c0f95364fd119a29135bc508a769fb136e9e8f4285b4a1cbcda05c5bb2dad8b2c5295701a6cdd5dfe8b5cf732643f4da072b3d00c1f74 SHA512 ccddb8301572e9fa80938a32b86e6fa508b4c67b56f53af2d8386a20afef497cee1167e7d7a5a8cff23576fdca3c9ca4df1d711ef774f112dd29650bbdfdee1b
EBUILD sortedcontainers-2.2.2.ebuild 831 BLAKE2B 1b1040594f4c8d2d769ab92b618f8b1461100415afd968d9243cbed1f1eec90865af8a34b1befcb4e8feb9ce279914c09a2c354c7030f1c16a6e21306943cc81 SHA512 e609483ef63ede55654ac47fc83c4b1f7722da95961d5a4e457332489800477a56fcdcbaadafbe43e9f6479416f38a408adc55271a392d7707fd2dbc0a0ffe74
MISC metadata.xml 428 BLAKE2B a57e7ccaa33683eb26b7c30516ef267c10ff1b5057c8a5b2327228c1ba5e231cbdb137dffff389906947cfb7eed56f1a10a630634be2fbc91e20de4b84fe5c0b SHA512 71c37340680fda3bca57ae6c9930cb0e87c4f38c469964baf41e844302aaa25186509d556efdaf67c4750da50b2fdca8ed9dac2d9f287c6f83ccec4fa7f7aaa2
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.2.1.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.2.1.ebuild
index e70f737c3eb3..b4838f734641 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.2.1.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.2.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
distutils_enable_tests pytest
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index cf90c17bcb6c..d4b69ccfecd4 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,5 +1,5 @@
DIST sphinx_rtd_theme-0.2.4.tar.gz 1392456 BLAKE2B daf2365d74823465a73ea37352f0a8e85f196ac9c89006e79610a2981b1a266e523865c3b6f7866fa9e77a856c5a6fe001a2eb114dcb252920b19231eade9709 SHA512 865b09febc1c289d47a8be3f3d7caa9d2a4715b350e2e2d058855831321a6f870e8339b2ef22eafc2b9fe72ad48f96b8d2fda4bc032c5f8dcdf23f314869cfbb
DIST sphinx_rtd_theme-0.4.3.tar.gz 5391190 BLAKE2B 6e08e079378c023f160fc3b858544bec6a295b256564d91c49b9ed8b5d2ee87bb2f21a30239f99fd2463840d194fde820c84ccd8e0b908f96fb7e5ca0fd9e6da SHA512 44b9309ddd041181542747c70b6e180c07aaf8cd7ee9e4c7eb9e3948685b8bd578e815c022bd991cc7f4bc7d02bb3c7a6d213e5d0c2e8214aa85d50b73e53853
EBUILD sphinx_rtd_theme-0.2.4.ebuild 530 BLAKE2B 24792fa3bc71996a62c4a6ffff9f13e821b3840c4f69837424be49ec310b6c9aba88603cb117646499bc53c545ea222c42549ffc2a6e685ab56d551757f1147a SHA512 db6eca3195cf032522a5efa413f2009133af06f9290aa6d04d6a5e624253eb761b40af9e2206cb20c5f131c48a9efe083a8d4efac9f9c425afa995bbaa575ebd
-EBUILD sphinx_rtd_theme-0.4.3-r1.ebuild 634 BLAKE2B 2a78f55798905b5bf73c178e16a28d2a61c4806a60b076df17509ad047d97969f6739354d4979db3edebfb115414d54f670f23e8f04001fa6091fe4257b62c6d SHA512 4475afdf91b8eb61eb0792b3f67e01d6f386f8a656c4818ea51fd7419419d67a7c20110b81df731b3efb7f0073defa59d9ef6f44a1a1ca626246d8ce917e6e32
+EBUILD sphinx_rtd_theme-0.4.3-r1.ebuild 629 BLAKE2B 1a4942166bd17531c60d1c8eb7903252e032dc8db8a7c2378298021100fe3d01f44df944823a894ae0d1f8bd272b3240c49ce5265ab022ab7cb92d5d75346917 SHA512 1656b09b1272dc823525595ab04fc5e50fc07784573a0469f3cecddb69957ff1748b021199c6cb2af2de7ea5175e277514b5f958141f94396c2ce37d0fb13917
MISC metadata.xml 418 BLAKE2B fe6864764dcebdf3a58e27839031a1559f626bf9e978b8a3d0b4821e8b97fcb705e9d4efd113c009e810a2a8dfe0ff541904a28ce090ab4e1f275302771a244b SHA512 b52facf796826029a795da70e00eed180c79c8b5bb4ea9ba7f95e5afa930debded9b2003c3dbf5a622deed093cab47a657142e567f2e1b639afac53e23e4ab04
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
index ec86aac66c3f..753ef35d3449 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
IUSE=""
PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index de4fe678f158..5f558c231198 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -1,6 +1,6 @@
AUX sphinxcontrib-github-alt-1.0-init.py.patch 255 BLAKE2B 7451f0920d802bdb06217323719ba0b4cfb5d64a2309c7a051df58a2e83ce22ac1515176fe3b1a3af060da11e4a5031250f13c5530119e3dd63c32b16c0ba9a7 SHA512 2f84e82bfa6fd24fe0707af174773348b23aa7591e5c6ac9a7335e2b87721586e4f84157b33a4421c15632ae6a890c5c0c55090fb403bba6927a4d36bc1377e5
AUX sphinxcontrib-github-alt-1.1-setup.py.patch 598 BLAKE2B e740a7a90e6e158a7c88943f60c81160d4c6616280a961d6afdc2d9dca59cd04b32b9e62b6b243a16cf4c133d5c5dfcebfc4bc79a915d4699385b1af2d270690 SHA512 763d38a7c01f916382f558635b68c2eacc7013b2e6a5f22aa5299bcd6303223994b9166ba8a4b8c51a6f57c8f592924d9f389b0547dbd5baa45d5e26e0229b4d
DIST sphinxcontrib-github-alt-1.1.tar.gz 3312 BLAKE2B 4665c873bff44a65b0aaac4ea853ac4edc3447850f6c18a8c7b717a84e158c6cf0c16116bbfdff8f3419b8448272a180c57283c324ab5052359da4522937abbf SHA512 b7af74e3762d51663bcc8a33d10bb63ae5fd24e220919719de5ff9421ec2ae854b84bb9f17f379fa174996edc2160580fb49b0030bab4cadbdfbcbf0a0cd509d
-EBUILD sphinxcontrib-github-alt-1.1-r2.ebuild 640 BLAKE2B 7da032195c19cda1ea14dc0b97a61ff4b1be5a9163d5f383f55ac677983e19b79b66a01588c685151f149f095867da857fb1b4668f1413895021203079d51305 SHA512 195f73a7df7c81e115a39f320d98382442498e3a11c1cb58c0916970e4db6803b1cf535d554d6f95653e594211fbf75a9c8936f34ee60c9443f0bfb6f77e8bc0
+EBUILD sphinxcontrib-github-alt-1.1-r2.ebuild 639 BLAKE2B 4a3da83f802600a0f135826373e2cefda7cc1666a33e55c1cb0f14fa802cd49766d674c676e9652db741d8bcc109332a42553a1fd23930f62b27e66aa1e489a3 SHA512 bd3a90dbe6d36a2deee5f14ab69bd0a02c999482e58bc792b1ef12ba8f9cb1d483b0975f50b665da77b442d2e38319a88d6da5309aeb1dba624758230a59fa2c
EBUILD sphinxcontrib-github-alt-1.1.ebuild 873 BLAKE2B aec3c67977947b4ac0aeb7ad3c5306bd10a294bc28dd9c822b4efa2cc411c51d6d7fc5a2ede3feffb7dbe6d4a02bdfcdf0dc965e2540c02d048009d033518f08 SHA512 80656dd0b99a89e07eeed24c3ea0d67e215c174d69d741f71e1b45799ea74cdb1e1a2bc8e898c54bbd866326c8d06f71ef17613faa2e1515ed3596162489df8f
MISC metadata.xml 412 BLAKE2B 2cd07799a32942d97bbc9aaca814d37fa7a02eb748ba60da3740f6d9b37ede1abcdda4b7d36f68c5df26e9af0befa1741b0e55a3b7289e986aedafba98ec703f SHA512 6453593682ebdefbf75a1818ce26347827e3be0819bdaf7d6f407eec24394e45275d3bfec3e1cf254216b17fb6f642b2ddd06b5d92d3488706dab78a03d632a6
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
index 1d814e6db085..9e73c8a3891a 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/jupyter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86"
RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
BDEPEND=${RDEPEND}
diff --git a/dev-python/sphinxcontrib-httpdomain/Manifest b/dev-python/sphinxcontrib-httpdomain/Manifest
index 22f0cb90ba61..f81b1c12b316 100644
--- a/dev-python/sphinxcontrib-httpdomain/Manifest
+++ b/dev-python/sphinxcontrib-httpdomain/Manifest
@@ -1,5 +1,5 @@
DIST sphinxcontrib-httpdomain-1.5.0.tar.gz 13981 BLAKE2B ca08a5cdc22d9898c6972ce8b7585fc4f185e3a0c8e49302bfafbfc88b4bb69d9d3deaf15cca2dfcd2f218199f509023aeb542129fea2003cecb2e8ef8215fd4 SHA512 e393690314cb7a7b81207ee42826eb5360ca6cfa8ad1b57c9a8dd5897ed1ed97bad4a46d8348aad9d5f6b6145e5456af629b14973ad2561d5b90b2f8dbf2163a
DIST sphinxcontrib-httpdomain-1.7.0.tar.gz 37493 BLAKE2B e34682029ed2f59cb8c70b2a5270a2f89c4cb08179fdf3a53c65f1ad23eebba71bff5385b5d3fd971a6e3341457b253e4187632a8bf856ca208843938bbde056 SHA512 8c6e40dfaa29a552164078fbc96de578b2aac269cb0ce5e228293a85f87c4db4ef8c902868caccaca709df938d4e3917cc77b3da9bd889b9c6f8c6fa242dcc0d
EBUILD sphinxcontrib-httpdomain-1.5.0.ebuild 800 BLAKE2B eef5af929417398dad90c696df9bdfe95dbbf1daa9e751db894af5310a27f6b5b4de7eaa54aa5a41256da940ec37149b9e705e1c9060556e2eb71d8d5b8171a2 SHA512 732195d97558f0a8b2ad135f051214c99a46d675bb74a6262cee3ad011743f5658e7a2915f3f187459a98cf069979ba8572ef99edfefa8e00287d17e4e24ed75
-EBUILD sphinxcontrib-httpdomain-1.7.0.ebuild 903 BLAKE2B 10567eb00bba0d6be66949ed28c831a14cd5a70f54d5f0c60aba05b8a15c465792082b840a1cef73e4dfc991488681057085bbf9b822718e751597389a1f3d7e SHA512 3be197d3b07754936da4293ce9f6f9012c90f2349d9a1034dfd0478d4960c757c9755eb8871efd9072c1144059f990548c2ec2335ff4f50e223c8983546e730c
+EBUILD sphinxcontrib-httpdomain-1.7.0.ebuild 902 BLAKE2B 31a2ce02400255ddcab70adb8ef64f0940383a396791ce9f85c5de911e0c123de74ffee2647cb023547dd2599e3e10f711ae327d533ac7d9c3fecfbdc649d733 SHA512 30311286eaef4c4700b0e287361627f7cdcde8ebd47fb7582d1036cefa7e1f0438aefe0cf16347c49ed3a9db3f34c2fd5b70033600064fa646a667784fee0aa6
MISC metadata.xml 407 BLAKE2B cf0e92bcd492b79892ebc97b7639c016b4d1853a87bed8fcd1e367a9f6cbadce01015895d22011425aba76a4895b245bee0e5536fc959224a6bed08daef74a88 SHA512 155696e449933084fbe56dd900e15d17e12d52d6af29eb4fcb6c05ddfe8c6fa716974fa27085c34ae2e1af0d1739dba2616eb12092c606b2645f2008e51d64a3
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild
index 9fc457a4847a..e32ceb4b4b6e 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN#sphinxcontrib-}-${PV}"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-serializinghtml/Manifest b/dev-python/sphinxcontrib-serializinghtml/Manifest
index 24e1a43ab82b..455b47486af9 100644
--- a/dev-python/sphinxcontrib-serializinghtml/Manifest
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -1,5 +1,5 @@
DIST sphinxcontrib-serializinghtml-1.1.3.tar.gz 15799 BLAKE2B 92771e87c61658cadfd6c1b07b7537ddd26866b94efed26af968e92929ddda5ada37cfbebd06a3ac14854a3831715ff67cd6f5401c317bbfbd5bf2d014d7356d SHA512 984d1760c61886408fe16c717aa1daea6591721928291267d519ea9c6eeab65d8a46d018a7c57aa8508ca408c9e919b7094d2580d30141ce7bacf5a18504cb55
DIST sphinxcontrib-serializinghtml-1.1.4.tar.gz 18647 BLAKE2B aa5dcbacf28a0433cbe86d9da3f6dc5859ec6148f74714654f5095ed1f21042e0d4ab1cbfb1bc816c1de40136ac51cb6f78c913cebf5465a4a11c25b22b36a14 SHA512 d132f75f1e0491167cd6d0f5b3697ac0fc1b16e63fd3dcd480b961e332b521932e405679a695522a4aeb56f57949eb9b1ed7635e9807dd059ae44a6384bdc6d0
EBUILD sphinxcontrib-serializinghtml-1.1.3.ebuild 737 BLAKE2B 981338f2cd412753974a98b2ee7f8da962c8225354ce1127093d3e3e9f6e571e03355bf449c232f07d4f4c2949d8f157f78d3cfce0d0dd1f78cdcba68689a73b SHA512 3ae289009dbc0f4eca5f9e58935d3cbb1e7f14ad58e775a7c7bf30795788b3bf8b735b225afe67035f433f0cb99032a9543484c246f7f4c9c2096e7b8cbdf8b6
-EBUILD sphinxcontrib-serializinghtml-1.1.4.ebuild 912 BLAKE2B b0c7e26c0b482cff02e6f4b7955490b15c343cdab11d2095a4c2ee0497ac38c82627f63867e42135fe4078559f15983b69a418f0eb4369524622b1a374d13701 SHA512 d9b5d048675b00315a17dceb2047a2bbae3eafe63b0a7ed1d05fc66d5755c28465797e048c1253a6488d81b0820136fd29cae2ce298f30e80e0e030119807f24
+EBUILD sphinxcontrib-serializinghtml-1.1.4.ebuild 907 BLAKE2B d203181f2afec0e5fff0bd60834c223268dfff92777147637b596f904f88e798dc003ce42063a49fe31600ce01cc42619c70ec532e292c6f440bdc8b8b69efd6 SHA512 7559090564b4d41971651c3efeb7c9d5e379eeeab354251d690909f1bae1f0e842642ff3ba0c0413df546c7a99b20107ff47eedaf27931f8738c5945e6aca339
MISC metadata.xml 332 BLAKE2B 899af9aa52c89389d9e459271ba959cef6ef3fc63701e3f0926fcc9bf93c548364cdd2f0b821e167e64ddbd0149d36b75faeaa40abb53bb83d0cab1a8d08247a SHA512 f50027d55de1b3fdc6afc87b99b2f043378cfd2e6993accd208019a84416f7d32824bd0849a18a185db739f0bf77beee794a7b3a7e6430cfd2af71f3c011e235
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
index 03118bb40338..b4f1ac0f75ee 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
PDEPEND="
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index 691017ab0351..0876078d8072 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -5,7 +5,7 @@ DIST sphinxcontrib-spelling-5.1.1.tar.gz 22883 BLAKE2B eb5d13e73221dd4de86ebddc5
DIST sphinxcontrib-spelling-5.1.2.tar.gz 22962 BLAKE2B c7b15289b4b6dce5e6c5fb529c4be2cd7c1f41d8bfc6ac86daf1a982f711bd2c426d9b3a615471538fe221197b64ccd907efd4620ea2440f6ec07b2a078d6bee SHA512 4a0398b7c79a035e12d9ae96100fcaa4df42aeae07a01a73f7d875ba04fbbeb3d7441c9debe77491876d78b0a3753677cff4cb3a575e3490364fe5780f5a70b2
EBUILD sphinxcontrib-spelling-4.3.0.ebuild 1205 BLAKE2B 8aa26a7e4bb89148db02ed0b838fd5b03b8e85dfdd9e7929e39a3a9edfd7675a3f6673d3851f8af6f204b6f9164cdee62a9f3575a852afb55c4cb2a1cae68eb7 SHA512 77e9ded8067b711906e21eee5284d13381c4e602907598e9452fe238358db3c56d7bfee1ffe7f35c861f45aabd55c89f17cacdc06b9c6cba1d58c08b9d01a1ef
EBUILD sphinxcontrib-spelling-5.0.0.ebuild 1232 BLAKE2B e25fe65bf383da4f7096536199c81372ad500b5b16174e9a61604f92edea230cee154455603ba434cdfdbe1c228849476be831979a7689c6a8bafb874a8d017d SHA512 ae2ccd4acb5132afdbc16f2685652d91a20d713abf256fde34753383184fe6c3737f93ca8a8513c46dbf62e9c733a5e9656a5874c6aac37031e5864f56cae0da
-EBUILD sphinxcontrib-spelling-5.1.0.ebuild 1231 BLAKE2B 3971148c1c3e13f254e4242920dc371ed336229408f01428c7704e97f9c825ab4d40172bfbfc32df2354ddced287df2be4f5cad306769534abff6554fb7b79a6 SHA512 26d3fd133d270786cfcbab7e568fab1cdf61e3983ac366c5915e4e36c3148abe77fbe9fc82058bfdcd1e47de5f6b4655bb23671025ec88a4abedd4f65214f544
+EBUILD sphinxcontrib-spelling-5.1.0.ebuild 1229 BLAKE2B 8f93854fc610d8422b7a9fc55cdd4f43f9dd3e62abafb6048607acb7706af9b5938ad020d2ea203e69c5439ce686ceb71d96f4e07a133b11c0314e711c06bdd2 SHA512 6e71333a434e7e064c30e10d420252f537d64b5375a609c1e804bbbb9327ff74b684afb337062017e578c9aac64d1d8e961b6cb9016444fe8ae8bcdf8e644467
EBUILD sphinxcontrib-spelling-5.1.1.ebuild 945 BLAKE2B 3b395b17048904a7c84c44618f52e0e63929769f4ee90748e3958ea47378d2f11e675ba97d60d12152faf89de023e02737ca4bfc10cf16d08e8038e5e1cf2830 SHA512 5b79be68ae961bbc490168a4be3508ed6d77a0cf5d1ac423a2323d2ffdde2db5c083027dd9e0aba278466ed39cfdb7d0ccde02ef6b13d717722e83362d8bc03c
EBUILD sphinxcontrib-spelling-5.1.2.ebuild 945 BLAKE2B 3b395b17048904a7c84c44618f52e0e63929769f4ee90748e3958ea47378d2f11e675ba97d60d12152faf89de023e02737ca4bfc10cf16d08e8038e5e1cf2830 SHA512 5b79be68ae961bbc490168a4be3508ed6d77a0cf5d1ac423a2323d2ffdde2db5c083027dd9e0aba278466ed39cfdb7d0ccde02ef6b13d717722e83362d8bc03c
MISC metadata.xml 378 BLAKE2B 238ea1508c65e2b5c05360aafab23da6f6f25693c677232862302d372dcfbab0530ad8964d6e393935193b5f9341f697de28dc2a3634c7b726a7f10762df8d73 SHA512 b5b909cfff41351a21e2fcfda9a9c022d600943038676ba63cfb525cef2d7b85c78b61bc58e33965f14a0d559f74cfef1f943058a4bc7c70cac2be34cda8dceb
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.0.ebuild
index 232987d99eef..e1ae889909ca 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index da4b607f8d8b..61d98a30a32c 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -3,5 +3,5 @@ DIST sphinxcontrib-websupport-1.2.1.gh.tar.gz 599593 BLAKE2B b996db8c799399c8830
DIST sphinxcontrib-websupport-1.2.2.gh.tar.gz 599606 BLAKE2B d7e5754491d0f4e4b508bb5ed58f41d6f57c8785ce2d658cd4beb658b9a01a453bd791e73deab703ebf17d18ddf0a3adc7c72a49e80c33475daca41666da694d SHA512 39d7d688515440fcf7a0df9cff60402499956da4c4d5de4e7b38982ff23ed837e7851a3c747135b9298d0df59f3055a8f588be78f10d98110ab50b8ab434db34
EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1174 BLAKE2B 27464db31f09b246efd1aac60af5a10156b2d3d920b5c792302a8c149f4efd244de1e5153480d6358910bbcbd38dde71a517ef18e58b64e2011bd5d8c9d7d405 SHA512 7c4bad117252a35c2aa92a0a7c432e3f298aa54627a3af45d2ddaa481035076fd3439aa080331e122d3487ae6cd200c7383817b6ebf85ec1ad35f3cb318af9b3
EBUILD sphinxcontrib-websupport-1.2.1.ebuild 1226 BLAKE2B 04c3ad496a43aa227d7f54934028a5c278ab813c4dd41d57e068931eecfcf8f1e0f39b047db1f3349dd68fcb50ccf379da477f49d4548b2151663747af4191ec SHA512 b64cfaca1c9239c00c5e5dca3f99cf457fa413ce06e6211135b4f588b2adf8f4b0f3524c828ca5e0620660ac9b5b3e9c6bbbc17c99ace0f5c9151b639cab4f98
-EBUILD sphinxcontrib-websupport-1.2.2.ebuild 1234 BLAKE2B 22649b4b4b10e1e59541ba23dbb25f85d6cd9066156a6d72b664f347cdbfa01030a988d12f93021cea18e6090ae574ea040d0180fbd6b81a0b6700e821b42050 SHA512 72c29f46fd1ed6509f811b3110f2977f91ea8e188bb9e0b95e1a433ff419e6832155a064e7f0815a39f56a8e3984e430527920d625d2c20f532c02431361e0ac
+EBUILD sphinxcontrib-websupport-1.2.2.ebuild 1229 BLAKE2B 85b8bfc92f1957023723ddf599d1cc6a6b48d8c14b040cae00004815057901c87cae48404d401578b2e5fc024ae61620b265f5250e2ae411c7acd56fe0c1bf63 SHA512 19858724a2da2525dace356454aa04d3bf75349b8e9dcb5c150e43fd617a2d1f70fce44fb60cc1e90b43ee598cb5d4f0f10b7996ad1b0f7accbcde560b331735
MISC metadata.xml 613 BLAKE2B 2113d218297d01838878ae22852cf3e78c7bc8807f2c46b1eee03442b3e0af2d3762d331adde3d116cfc71bf5f0e0d7f2b5d1f26a18d9c5fe068eede34f971ca SHA512 ec3a2a5917a3332c95d48f42d0ad2d0bf91745c2f61f57f1efa11d80bd828e635cff0c22e604cc11aa7ddbbc73dc93ff58415c75c87b4c00cb60c668e721b993
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild
index 600953456c9e..c1e9063d535d 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/${PV}.ta
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
RDEPEND="
>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 136224c8c49b..b405c1bdd81d 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -2,5 +2,5 @@ AUX sqlalchemy-pytest-deprecation.patch 2695 BLAKE2B d71c791e39a6caf9d8e67dc61ed
DIST SQLAlchemy-1.3.11.tar.gz 6007784 BLAKE2B c889ea28ae08fcb83d338ab01a64533142428ee91a6c11b9a7f2116f99161c066e66f49d76bdd2c7600f1a7f86a2add217f49dda4cf97566a875f28d3d4b24be SHA512 c691539db4edd62af749087728dfd424010bfb3ca2cc8503a4b96c1625d059d4c2a748b9a35cc870cc99ca9df61966cce406f9b570b25e55c3632a99b8621e74
DIST SQLAlchemy-1.3.17.tar.gz 5979141 BLAKE2B f0fa46493461f532ebca9420fc9f49a2c04af888aa99653946a5bb563d40b8bb714a03301300ebb80cca76a99f8226ddfcde4216e8fc2593d3a161b5072276ab SHA512 6f6d54b9018ece6c289f28a3a41ffb1b2216206edee08c49f387e9f30740969dfe0f8272654ce4efca159a2a6619e76c41b2ad2b10c391cdd64681ac17d0bc79
EBUILD sqlalchemy-1.3.11.ebuild 1598 BLAKE2B 6fe7989cee639c1299f36553fb1af8c2b94968622db2ce909d3a7af2443fe9ee8875dd5ea2c0fd862a62a42e58e18425c7ce3f7b7db74e3244f6f2cec85edc80 SHA512 c18a8f06666afd03c7852e5bbd5ea380ac28684f26af01b656cdbe8589754cf0ad6dbd57a2a059616a0bc55c02dad0130afdc265ed86d7ec41b3c7e37e1791fb
-EBUILD sqlalchemy-1.3.17.ebuild 1481 BLAKE2B 7e80fa096e65dc95caba7112f9f870d74d983bace3a16b3a836b6fe7eb50ab4f07ef05c8c16aa5bf615ed317a76fbc73943de29ed208c1e095e9f87ff70f2b45 SHA512 f85616ea8aeb83ebf1e70a9b95296fc966fdc5152dfe7e29325703649c7f37a801017ac5eed55359acb04c530fd808fed70d71a4f8eaeb5fb34156b0efd669b9
+EBUILD sqlalchemy-1.3.17.ebuild 1477 BLAKE2B a83cdc86960aaaa4b6dd281ddfb83a3342570867d7117ea5088b7c37f72fd5b8b293d54c65a96bfdcfa93594f5109e9b74eb5cdd9cc1d0142fd8b628a36abe2c SHA512 72a36510cb24792c3bc9244fc1853fd0bc04ede737bc64a7300e68764173b3b0fe8fe4f90525869d49144a44023b02004114f52bc379891de890e096baff6c58
MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
index d73c691aa0a2..a75288603a42 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="examples +sqlite test"
REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index b630308ac337..09edb3e6cc0a 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -2,5 +2,5 @@ AUX 1.0.0-tests.patch 1058 BLAKE2B 4373418085d6382351a99bc6cee59ad8c65b4048ce83d
DIST subunit-1.2.0.tar.gz 460532 BLAKE2B 7f8a459afc576efed8fbf271a9d2e175ae9de9dda68acb26322f222ac46f12fee5dece4cb2679fca608ba307a3692aa84b13d0e093606bd89a53c69b2081cd44 SHA512 f6559fd771ad0732985230d11a9a8326ef35c817b62d1f50dc332f0032f7b08559a46d2534983b7d3964e45682ac49b3e348581ee0983861390abcd4ec20459c
DIST subunit-1.4.0.tar.gz 488022 BLAKE2B 4c3a714d02eeed9420074c4e032778a69b716a5cad0079193533e9bc8c0f4576d70b165eb413203ce8a916ac28466e9f5a113d4a7746019d7d09409df9860bae SHA512 5d2e3cb96c09067ef4595c86648f13330c810b19e39c0b35bc9546c57bee957ddcf5cad7b8e3f92bda9b54dcdbf175863e2f6ba94020f880230459be7afdbbcf
EBUILD subunit-1.2.0-r1.ebuild 2621 BLAKE2B 4e4f4caf6ea78a783a23ee20c251051bc78fcc933b099e4729c1ecd1a3d9b63a86519ec76d29eaba337c932ab969bd0493419ab2eb50436492e7894fc3ac6bd9 SHA512 f0d0a2053f0f09155605d1fdbb2fcdb089d4b6bf1881c61e8caef4d470bd6281f1ef8b11d2202e1b0ddf8cb90f7cd0657570c777694f707b7396d69a0d1da320
-EBUILD subunit-1.4.0.ebuild 2402 BLAKE2B 2b23d8e6cb91ea563724e49ee40270574e67efc183f8ecd446f4df67f789395c25e7622c98585848c153f161a2f10ab4053edd5f779dcb3a66d73a93e3dd41a2 SHA512 409bfcca1ef18bb4ee01291f3598e6d31b2e3df56bc5ac6aadfc00d734aa7f494e0ff5fee86531111abf868925aab90bddd0921ed0fe6b87730b1e7f19b12b0b
+EBUILD subunit-1.4.0.ebuild 2396 BLAKE2B 9426a52568fe35d6684e38a044034a933102f8255eabeb6b7274162545f4ad0530a28587df409a94a13fd8ca7ff5dc5d1733eee551a257305dc028f86cc03c3d SHA512 d8a0e45adad620efafdabd38fcc9717d1276d825ee1e83e2d3bc22d0f11b44ba44ece8c1716e147be943c672c7b5341691d3c131fd23551138309d4ccea65314
MISC metadata.xml 422 BLAKE2B 7835651c50d6d889887dc834dcc5a387cfea9c61867570b6c98790a1c7ea49c01a75868f6bec4f31ffc46a38dba51eb2c4ff0b6da8f8acfe6059e11e3db7f727 SHA512 dcac9ba5ff93016141b433c16b9d1a526ec2babd39721d75a6edd235eb6388500ea8228b6c8c88eacbb12c732c36883c0b698f7039aca7909890fe16cb895cb8
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
index 65fdd6aed637..5a5855e2c22e 100644
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
LICENSE="Apache-2.0 BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index a2ffbe849424..bf5d6cad51f3 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -5,5 +5,5 @@ DIST tap.py-2.6.2.tar.gz 148974 BLAKE2B 5e33c7af37c2533b4fd5b45684cc93793027b50c
DIST tap.py-3.0.tar.gz 141764 BLAKE2B 0d65d9c0691deef31475cf6db172e41340e112cacda240d32a55338665632613f09c98d0c7dcfbf28be997079f789054d71f1059fb74228507041163df9710a1 SHA512 58b0928dd28ba525d9bb5edfab5606cb67af15e75a5f03d2648280d30377e2aa23b314ed41dba3b09b7dfa1aefead53674df43b6087e552b9aa937472838e7db
EBUILD tappy-2.4-r1.ebuild 966 BLAKE2B 23e0bd2dc3e5d034163f0c6062423b2e6dba97368321d0c4a96230381f2a281d1efa26f7e051572e0c12be2268782d23bf1e70854774e173c9eca4992b7662c9 SHA512 7ef744f84331b3ecf541a3301f54a301aa87b229f3e801fd84cfef65de446deb4e343bbc9dda3c50f888d1bce3e2725331e43850c310cc4848592dd2ee15664c
EBUILD tappy-2.6.2.ebuild 973 BLAKE2B 4cfca43a10f5c625293fe2d54765bf983f62148276cd7ae13efb0ad7e4428564ef1bfb2a5765e0ca5fe70a6daea1790a35ef77e6ecb650d331e5670b5fb8a4c9 SHA512 a349e8985b100286badf3282b63241d8d418767d5fd4694628371c5c94e386e59f21b85c2294baae004fbb7f769547c66da2988376f3b8ba5e1111c7a85247ff
-EBUILD tappy-3.0.ebuild 848 BLAKE2B b3022a0abd98ffd5dd49690e7fe56942c849461606b3fd46da8c8a24d6863755f6aeb8fab06084192b6c0ec6df97525ed024ffc59606d6e94bd40ecb08af5d4d SHA512 915f6004d1232e880a75ce901929aa43b223ae187704149adfb0a1215ede71026960e9fea07b94956091213fab1d340e18aa3fb3f244409d809d73b512fc8eea
+EBUILD tappy-3.0.ebuild 843 BLAKE2B c567daedf66be0b7783deb10a2ed053b402f0eb18f5ed364399cbf7934cc25bcbe4d017ff33454a109e4feec1f369efbb04e41790e728540dc8380c4210d095a SHA512 d37159ac6d10bd01edf321a3e9543734c380b11294a420c886d0941b6776b4ba78597c24c97108ab7108154ce7ae9db060cd99493574e233d44fbc55909b2fae
MISC metadata.xml 466 BLAKE2B e3ae71b2ade021aa7dac05316df1b14e1a483245103cff6aea76b6663735f5f9b2d772a7d75c6bd539da8bd1728f82639e324822fe86e1a5895b6729f455f8a5 SHA512 d43be4cc82a9795c36d9d39b37c92bd810148551a635879b802aee0fa87f833492a4c67c5e12c7b9d2cb800295242faf4157ae0cfa04269261a1b438a305262b
diff --git a/dev-python/tappy/tappy-3.0.ebuild b/dev-python/tappy/tappy-3.0.ebuild
index ffad5f6ae398..337da3b2d0b6 100644
--- a/dev-python/tappy/tappy-3.0.ebuild
+++ b/dev-python/tappy/tappy-3.0.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_PN}-${PV}
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="yaml"
RDEPEND="
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 389686237713..d53dbbd1439d 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -2,6 +2,6 @@ DIST testfixtures-4.9.1.tar.gz 90117 BLAKE2B 6560d4072f8b0108b7d7708c980f40df1a0
DIST testfixtures-6.14.1.tar.gz 114969 BLAKE2B 21e6b377e24240cb275feed2e160da256ca75884c5a6dc842364986031c3cd21fb1b5bc13f3e8780354d47179e6c038cb461a39a04d34bfc8beebbf9809d6431 SHA512 0da31d5e382984c22ada846c07570d4a179ba819005dd29891e551b99190fabaaf17174456f7ed4864e9c4aa25f7d5d8b86aa123b4628328610d6930c9c5d6bd
DIST testfixtures-6.8.2.tar.gz 110838 BLAKE2B 4b83a1459aec4bc4b4dcdff48603958bfd115806ce0c567faad37ac273e93096cf964af08d24b98c1743d6302d1b2f6f9c9498023c781ab3e9170e2eda74cefe SHA512 ce6561d976a0b8f79ae72aaca6f5ffa8d1cae30ad73d3d88625ed4fe55da5f0a913785fa3e9aeb4268dfb243a7b74dddc262554521a71c766089383aa5b0e022
EBUILD testfixtures-4.9.1.ebuild 1457 BLAKE2B 58500f713407ddb1ab8942f4212060c985ba4478d905d77a249bc0efbd05f93f495d4b76f9da858a228a68bdc54f33727a312ae3201ef95ae03b376877ca61b0 SHA512 aca837ea2ed905e93dd3c9c4908e88b8ec1f8f1bfaa4b00c96f0969722bf93b7c154c227c2471fd2805d12d10a0a185e9b3e9786c1e9a769431f768fbf06b451
-EBUILD testfixtures-6.14.1.ebuild 1505 BLAKE2B 87b8d0399d818cddc9bef652d1681adf11b77fb3de28871c34ae2ee7d337b24ad84b43508dc30c85cebfebca35cc49bb0481f5b62c9b3233a7e2252a6bbb8577 SHA512 5ad0861527fe05c5865b02155ccd80fa4a02a8849d7f76632e4553c7672a010bd86544590fad8d7d7cafb5131bb52423167a51ddb1423fc367d24737b36427d1
+EBUILD testfixtures-6.14.1.ebuild 1497 BLAKE2B c70168019185c9e49824e4e3cffb3f45fe28ab3a8782bb35f7b7aa4089b824b62fb05c5041bd0bddc3507adc2b4863a5d15901599ee4e0a21386907a8406568d SHA512 4b0f50aecf8a3da34701e52f7b3009df706f5beb69624748d32309868a77e767b31c119db501a37b550f2459708aa4167b19719b2815d3c910b94f9d7ca2411b
EBUILD testfixtures-6.8.2.ebuild 1458 BLAKE2B 66b804ec92096bec292354e43ae38a80ef399446f3703e6db9079f2ef819147b50fafe9c3df90a3094c1b67de623f55d51a59aa2eebeb217ab84b86f5db68d81 SHA512 43e91b8248b0fced7f5205a09038c6a56b06624ad258258d2dbefdde49104911fc9271c805b85248c6a491a59843c63430b11003dc35b247721da1c7efaa1023
MISC metadata.xml 415 BLAKE2B d3e133602f86d013faf5998b2e52256dca88ed9593b9ea26bed0277b70823eda4dd27deca7488a7f66fac2f77e3312cddf833a4b865cf400c7e78a4d267a4c5b SHA512 78fd16b4fd4e8ea3f244b3d8fcce8451a38713d0374df3d2661453f2ad06af587b4613c9119b11bf4cfe3d226fd04620bfa74f58f2660e44ba7e84b93c99c20e
diff --git a/dev-python/testfixtures/testfixtures-6.14.1.ebuild b/dev-python/testfixtures/testfixtures-6.14.1.ebuild
index 3dccebaaf69a..1c445c878270 100644
--- a/dev-python/testfixtures/testfixtures-6.14.1.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.14.1.ebuild
@@ -17,12 +17,12 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RESTRICT="!test? ( test )"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
doc? (
dev-python/sphinx[${PYTHON_USEDEP}]
)
test? (
+ $(python_gen_impl_dep sqlite)
dev-python/django[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-django[${PYTHON_USEDEP}]
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index 7d3140fa2211..8134d6ab8915 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -5,5 +5,5 @@ DIST toml-0.10.1-1.tar.gz 22559 BLAKE2B 17d9d9c78f2b78a6fc5bc0efd8530af5514d2f96
DIST toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz 19593 BLAKE2B e9deba7c5d1eea7bd87fcf5e5c74bda4c2b9e9686e597e3ad51516f60eb8d192fb01d052ac57729c6f0851e2715cc6409a904affd637c9b099cabc1b12ad5d52 SHA512 7bd69b8c14f09bf431094b52d988eb233922527719ba5047ff769d2e709c2039fb6fb1c8144e630ad2a58835d19e0e4cc51433a427596d37f8eccb6d73d7e5c0
DIST toml-test-39bb76d631ba103a94b377aaf52c979456677fb1.tar.gz 19304 BLAKE2B 5bb73ff91146ee85f6844132cdfc06673cdb384810c6c978cfc9f8ce6ba8b1607a0dc2d03aa868791d5fd33d00ebac96a4cd57a98948a3ef9318a52417904eda SHA512 931ba91b77da576979bde290c99f6cb1a2eeec3aee55b5041b0216094c584934d560487d329df21caa64b405ec50b4dd417dc910bbe4f15b1440686efc58da29
EBUILD toml-0.10.0-r1.ebuild 1176 BLAKE2B 8eedfef64d2c2c48fe2de53aa38bb7cf6261de812f869fe7cdc91639d03a7df2ed5e01c22915a3105c2427bbe854aa487fbf264456a2c55fe7072ae5bc3fee65 SHA512 b724315fee3649260755161708cd18d90a3cc213f36d50b63db036f57fd3c178da6d4ac1bc87e3a03b1c09aa10d917d2579007aa08fec0e1d91bd41da99e3038
-EBUILD toml-0.10.1.ebuild 1064 BLAKE2B c3850076c8b7f793df711188e90b6846473ef736078235ead81e93ecd4cc9da1f8400929c6c1498032ea6208d1aeb383dedfbd499494ee2cb1da3189ceb085bf SHA512 77376a7154a051f19a038f9d900c6fee1e78b30f749b40efcad5e274965117c250d6494e588b2d64938086c7d43464f301cb7667a177e57802ce33e00b58ee38
+EBUILD toml-0.10.1.ebuild 1059 BLAKE2B 3bf6920c130af42a2d8124c572ee1c49514366c1bb37923f49d0d716a3726d41bd54b79f27c976425861b1e9eebfb987334e3fde6c5d8370ef7a3cf565c58fb7 SHA512 3cd411dff376aa4b7c2f77b1eabe6cd00d9579c47186dbe3f95a2084891acf234b38b562c5aa2f60b6ed4af130ac57d6ba512dec5d67a9649429e57daa9db964
MISC metadata.xml 324 BLAKE2B d9ee23ed157896fac55ab5bddc1cf299572ad05d4b1de97749c0ae196f01515272feea6cbb3e93a71ad908cfb1cdac70a702b2d94b6ef2a74ebc25b044b5c049 SHA512 d5578a5e1e35bb8b263dba80e0f56ee663bfc6fafe052a82889e3d1551a5143345645fcb09107b5115f78a1d40dd4b2a50609a2df096cf870ec6409764d7715a
diff --git a/dev-python/toml/toml-0.10.1.ebuild b/dev-python/toml/toml-0.10.1.ebuild
index 02c4445df242..f4f8bdf13905 100644
--- a/dev-python/toml/toml-0.10.1.ebuild
+++ b/dev-python/toml/toml-0.10.1.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? (
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index b4b5fced2c2f..8c3b244a09ff 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,5 +1,5 @@
DIST traitlets-4.3.2.tar.gz 88173 BLAKE2B 51848cc4405521872391e2e4e55bb6c32ac939125337118bdc6282f4e7eacb116ddc94ff901fec18c2cf023af5d39aec77e6737bee2f915b28b4032611257860 SHA512 4f3239bc31af224814c8181dd1ac0fe5287160aee48b2b0f54afae841c8a9d7eaed010082044b6d16f91cd970bf0aa1eeba57d4503dd919fc8c4613ac5150ca9
DIST traitlets-4.3.3.tar.gz 89838 BLAKE2B 04b50fabdc312c427f0cff6d4e8be0a5afcafe6d5a7a5804fb37e6f92b867e6a9c6401c23b7cdd7b0a6372eadaf3e8350018db5d21c5cbc546390138932a2820 SHA512 a7ae0276e5234d6d428908e1ec74c0b92f2b1b73e37402ad154151c41ef6e4aaaad53e8990d4233d8023c31d919e4ea66f100a82324abcb0e6ffb92283fd3c9e
EBUILD traitlets-4.3.2.ebuild 1086 BLAKE2B 8f7e815e49073c78b12eff632cf3e018fa9ee02bcb504e4c27c85b06118d144f7eca015ee29c95f6446639da5f9626234af19c74836c1bc7e12fbce272a4155e SHA512 d2276c8067b333b377e469f497e49519b4ea785d25d13fd16acc80067ccf60bbf291b791f7a3cf2e8ec25ea21d8c4646ea4adf6e89389daeaf8a99758b037ccd
-EBUILD traitlets-4.3.3.ebuild 627 BLAKE2B f83ef7bf7906b2301fce2ae921c39aafa68206c9de727c127b93d6e0f88ffa375869649becec3d3601d62e8e1b3aa6c05adf87a7e2f3a38540d5dd9918bb9393 SHA512 dc314336e489de5aa0d629248c38ca72c09268f673b706879be634788e43dfe8f4413bd2bd8f0e52d56deab105ed07b9bb4173a4a393a3741dbc4bb8093fd7ca
+EBUILD traitlets-4.3.3.ebuild 625 BLAKE2B 25a8d637cb6ccea1546a80eed407e19b77f2996b7485fa255bee8c3d8fd531cd1d66462fda3377ade48ce844a63996218922f110aec28be09d784688414b21d4 SHA512 041d7dd138feeb3a1b73c2fccdb012f509d8dca02707366bc5373f030f522a452465f37d6d84b985d41935101df92e54081b76a064d16773561fc8a57cff959d
MISC metadata.xml 711 BLAKE2B e8a10398927e2f5dd1d51df84ea8d156f175c2d7f5a14599d154cb413263cd8a396cf037fd50e9adbafa96fcf4dc060d3073ec1c775443538ecc963112728951 SHA512 5b6aa6c0c602beb2cbf3c2b6fb5eb35af48bb1fcb1801f0cb7cc9cbc7645757cac4ab9e06c492705acc3e51ae6565e5124d97dba6be6b204fa58483c7ee42204
diff --git a/dev-python/traitlets/traitlets-4.3.3.ebuild b/dev-python/traitlets/traitlets-4.3.3.ebuild
index aa50d4904df4..87eac371cd4d 100644
--- a/dev-python/traitlets/traitlets-4.3.3.ebuild
+++ b/dev-python/traitlets/traitlets-4.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
RDEPEND="
dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 88c2d2c13395..a949c103b919 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,3 +1,3 @@
DIST trustme-0.6.0.tar.gz 24062 BLAKE2B 77f72ab225653e5cd4fdf57b22c4a227e7f186370cfca795df57b5f3c1acdd72b920c0a4ed8364bf2ab4b367a8cda71550d9ff801d6e864eac9ecdef91d947dc SHA512 9fda58320f2055d2c23369d2df213994cafd9af7b7eb3933162bbe09a81abd7a9cd2b2e7cae43b25d40d20311213d8a1c13155b61498b848a2850d22fa1e1418
-EBUILD trustme-0.6.0.ebuild 897 BLAKE2B 6be297c4ced1f5b0da8a8c2272cbb3ab07f6af6931d4ea8a4374538dd4cef99f31307b4501ba51b97579d12e203d3f95515da60b6522485d3f1ea8db0860c26f SHA512 7d7e150711216d0d2aa3b5f0bbe112acc9adcbb99eeb6d07a1a8cc126ec949e544d9f9ec7bfbc6fe523cc2da49a32e045ba13bc2473ec8e3cdfafd09dfaa9700
+EBUILD trustme-0.6.0.ebuild 896 BLAKE2B bf267383b64c0aa26fe2e7fc856180d6a426786d91a5f41b85f98038a461a21c149c102fcb8c17748edc0cfa950c15456513dde17dc2fb3c68715921de8b45b4 SHA512 e225f772cca2c24a5512f25e098f96af06ea99e09de31bafc361bf0a752fd0794dd9064dce98683b2a882c892a1e3d5d7e08fecb366148c8c22a937fd5d8ba94
MISC metadata.xml 349 BLAKE2B d750432001725ac1266b82b174011a342b115739dcce7a9ba4da4465a907f64620f0e5e4e38cf6b41beffc4021cfd070b1f68b6da88f2a309f44c45d23b4b40f SHA512 6152f78467097c2e5ed0c65dbdf6bcedd84310b74c9ee92efda96fb855db3f0f990387a48f58f34e2c9f4769bc0f7a28b1c6c4be7e9561f6a3c4a22fa279cf0f
diff --git a/dev-python/trustme/trustme-0.6.0.ebuild b/dev-python/trustme/trustme-0.6.0.ebuild
index 1fe0382cafda..65b4f9e69b6f 100644
--- a/dev-python/trustme/trustme-0.6.0.ebuild
+++ b/dev-python/trustme/trustme-0.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( Apache-2.0 MIT )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
dev-python/idna[${PYTHON_USEDEP}]
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index 0b2a8d4118ff..b45106b3fd14 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,5 +1,5 @@
DIST tzlocal-2.0.0.gh.tar.gz 18223 BLAKE2B 46c3132c60140ebe93a7bc0848f97d7ee7481f29544ba93d11bd6de3a6ff2d17c9e6643a844c2dc6236ef26baebec070bc60e829a95283b7c037624bdb1bda7f SHA512 b758f6ed9677e9aca3909a65f64c45ed21e8301d20ddd620be58312661c9e2a2305bed90e8b86afeae92e6be9e38a35385c8b76ccd7cb12b027c341585d7a6a6
DIST tzlocal-2.1.gh.tar.gz 18463 BLAKE2B 73e886cfb6d13bebc1a15a222da60f368a15dc5a097acac74990b1d76bdaa229be8f12ff735d1828ccd78c4c8d06eb5bc0a07da695d70251af1e67e4fb71037e SHA512 2679cebdc2692d9e0e1c9b714994ad881896f53e75ef407229a67c9fee9d27617638a2919865cb67e21e2bbd6e3bc13f2568343037e06603236f25a96aa6863d
EBUILD tzlocal-2.0.0.ebuild 547 BLAKE2B 033a8b495d5263e88265fba1afe791d6091a2403b3f43ffb4a7aae1bbb06a7113e7d1162e0ba857973569b317e6fcc1da3941fb2099bba3f2479551ce5c91540 SHA512 7ef867d3c0e0b8c7436367c5493cada1ef3addaf25a2ce4fce85dd66da244e21bc9fb48f755aa5305dc4934f28de7408f50ed3223919587247c72574177a7551
-EBUILD tzlocal-2.1.ebuild 549 BLAKE2B 41e6ddccd827051411da1929ffdb6f3f1f1c321db98f29fe8a80696b216c459bbe6d31d62aac8a111a657a10a90c8b8ccf94dc958be5389bef783951ea315fe6 SHA512 25a9cf4aa4681bb25623ea7a9a81c1ddbd4802207ea9438db304c728b38054b1c6fff3cc00dda1587c82b25ac7098e1a350b616b60f8cc7daaee2598bae8981d
+EBUILD tzlocal-2.1.ebuild 548 BLAKE2B 8d86d81c3f5fd98e6b36b0dd865d508c22be0651fba1cbcaa3dc1167e90bb8105cde400b36f603eea0901196185a69d08a45bfb35e934a245775569f2e5155ca SHA512 cbe9f8579d524b5eba21a4eaf58806b6f32ac35e5596be4aefc75e3724dfbb579bdc0de5d58b8ab0486f65d6e8c3bb1c742de28c51aac5376c6d8d8d73c78844
MISC metadata.xml 377 BLAKE2B c85be3067a235a5d7546bcf7c3eb05857986a371bca6743e222e9016ab6d6d5a212f3f65d7e9db523ef9ddb8091b62c1cfbd2d5c5d6d8560fcf881aaa3ffad80 SHA512 3ada56c5037a2a59fb53408483f03bc3ae72c9d7f676dd046125b035b34d4195e653662b67529453d63556dedda4471a9c77daaa1137af1245e49174fef1fd87
diff --git a/dev-python/tzlocal/tzlocal-2.1.ebuild b/dev-python/tzlocal/tzlocal-2.1.ebuild
index fcd01ca65340..7a96f8fc69f5 100644
--- a/dev-python/tzlocal/tzlocal-2.1.ebuild
+++ b/dev-python/tzlocal/tzlocal-2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
IUSE=""
RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
diff --git a/dev-python/u-msgpack/Manifest b/dev-python/u-msgpack/Manifest
index b4d7b984466d..ac9db15cad61 100644
--- a/dev-python/u-msgpack/Manifest
+++ b/dev-python/u-msgpack/Manifest
@@ -1,5 +1,5 @@
DIST u-msgpack-2.5.2.tar.gz 17641 BLAKE2B 643984fd9ed2f87ad0cce9e64aaa064465048067098bf01bd844a04bc1b870d6688eac6bc9f1dddf9bf705fb14bc332796f06b8b59d0dfe79261e85ba11b60d1 SHA512 cefba7ed86d2b7c37b0d92e3a4fb4ec62c89dffee0be078c783010638413e6ce1af7ab959b43dfedb6fd8cf2943185c18fc2201a4a9764c423e8242bcedf21a9
DIST u-msgpack-2.6.0.tar.gz 19911 BLAKE2B a6599a85fcb386f91dce4d11fd8d10c6be75c1fe4e80756c58058bcb7c2934c2174afe65bc0b88e11c5c9e3f66b46c956c9209bb6faf74ab5c382bd665c412fc SHA512 b0f2fa677001705a8a1e96e590fd334d0561065e0617a56a31abd506907dc2446c93f8c4429e65e86c87f6d2cf3e19a921fa0aaccad5cdaf1acd1ae0a1235688
EBUILD u-msgpack-2.5.2.ebuild 658 BLAKE2B 2050f42c8a8b9c011da96dc51277281c69fee78c671ab7bcd26e85515c04a37f2251d28c7b9a87ab600411d624a611783eff0f8ca78b899690cb5d455c9f28dd SHA512 06ae2f885861b707eb94d18ebf0c2cd13ae853462430ec3df541dc820c17a09d101fb0b74dd99f77bc0e2759a9dfc01c0e66560f8fc96bfbdce819c3c98ea5e2
-EBUILD u-msgpack-2.6.0.ebuild 667 BLAKE2B 2227705246a9a38d87a77db93736e8b787a2541f16d696df87ee279c0c9fab981a7a7deec84156b9da9f0d5c613df5045ff3b2bc1038073a8222e473c51f09a8 SHA512 8e4ac4c5a920578a7e5b03a2857aa61da91daf49b2c7401c661a4e0bc3934639526e9c4180f67722c5f043112997bbc39414fe4c50829f89d7c8898b422af0e1
+EBUILD u-msgpack-2.6.0.ebuild 662 BLAKE2B 8bdf8a0d0b06af16dffa65bcafc91fb4e76dca4d9e16e6f92f80a5406fb4156f5e2418e352394650705878cea03d386b05d9e115fb881914df8fd38363898981 SHA512 40bc495dfcb12111894bc9145b0a46c6b6b58465c3c5e416d3ad3a895828f146994e0c4b21fb080099df7980786e0c1fb1286def8b9bac03f49f51b4a60defa8
MISC metadata.xml 931 BLAKE2B 14f05bd4d72f2d6d09096f581e720fba96e533781ad16d0ded28ad62f3aef92eeff0fdece705b6b1d8735f0756cf73f338ce26b92bc6380e7679aee7fac6970b SHA512 642b3a1e3f70a4a6d49f87f61e2a197f93ef47238dbd7f1d591cffdd4857299e3110a9cb01cfd430aca328ceb533e3c6080d765bc2fc0fa7fc133456e2ec1de4
diff --git a/dev-python/u-msgpack/u-msgpack-2.6.0.ebuild b/dev-python/u-msgpack/u-msgpack-2.6.0.ebuild
index 3bd4d2b913b0..535f0483d107 100644
--- a/dev-python/u-msgpack/u-msgpack-2.6.0.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index c9aaabc68d1b..469df96ca8a7 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -10,5 +10,5 @@ DIST ujson-2.0.3.tar.gz 7127432 BLAKE2B 09fc3bdd127e5b54cfb26ffe56eced194d7c4aaa
DIST ujson-3.0.0.tar.gz 7128523 BLAKE2B b19525edf1528e3b2a43cb08ecbf7b5d070f2455fb0bbffbe4b866bbaca91df09d7f4d46509dfb92d825095d4b922fc866fa36e051fa0e27af60fe558c69c854 SHA512 058675627c1275df1dbada02fca3750e544e25c0d0842b4a4268a664456cae1869423d832b7e4af40e56168b687ec711adf124e9ab34b7c06a244b61f7e2fdfc
EBUILD ujson-1.35-r1.ebuild 916 BLAKE2B 6ab2c9fc8d238905603795685517d7e7d8885311653acb0fc3dbeb329ac91f0a465315f25437d42fdca24627d8a1584becef51d61aab1af49eb85f28933124a1 SHA512 1f0e47f81964b8d7691863477836750ef7c9c44e900f94502c0498088fc5d2ff2e7770342273f1a2ea4356900741fef872c99bdc2636f247ee495ca4af269883
EBUILD ujson-2.0.3.ebuild 583 BLAKE2B 24b7c4e57672c9700976bfe3dab1c3a99c6a5eaa81dbcdacc0ddaf46cf780b59b1ceb86097e453d35c54d9b1d605d07126a2af476c10475b95da45590a9d5cb9 SHA512 0d646f96fe82f4fd3e28ce4b0afe969a6035438f033290aad0a08905b4f800e20344df1d523a2bd86cc9fed5241d0a3b876389c8a1b09d16f8caa9ad4357a400
-EBUILD ujson-3.0.0.ebuild 635 BLAKE2B 7e8b8520525861b7518e3c5a1a53bf1f5bedfd83b2610bac87f9179f51aaea0c3f0b4196ef87a1b4933b557c386b12ce2d09defa886ec15e74fd4fb5870e412a SHA512 81cc447cf26dcda9a350c7ec09bb2cc88f6bdff8a26aee6c7442224fa16afb7cbe2008b349edace853b95595ebd6b114cd9517058ff496f4df169a2ced5e6862
+EBUILD ujson-3.0.0.ebuild 633 BLAKE2B 4a11b9c4c3685fd8b8195849c7ed4a83f83c825bea86589718fc528d3385408af5dabd5e44a1e863c812a5fab883b7901e36ec9d22801cbd1e7452dac3585cf6 SHA512 4d7356efca506c7f647e7f565dc9af7c424a1527a8f1891ef49cb8bd6c7f8feb26fb1c4bd0d7cb96b3fa45e03ce81ac5636bc2d5aae79091c568fec224361a46
MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/ujson-3.0.0.ebuild b/dev-python/ujson/ujson-3.0.0.ebuild
index 60a87e3a0884..4cb2eb8ecc3d 100644
--- a/dev-python/ujson/ujson-3.0.0.ebuild
+++ b/dev-python/ujson/ujson-3.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/uritemplate/Manifest b/dev-python/uritemplate/Manifest
index 80f10dea1868..ae1969892fc0 100644
--- a/dev-python/uritemplate/Manifest
+++ b/dev-python/uritemplate/Manifest
@@ -1,4 +1,4 @@
DIST uritemplate-3.0.1.tar.gz 32806 BLAKE2B 71fb7ef9fbdd61f3a3f67c5615cfb65ab261b5f9ce1c5a534e155a9723990599bf50e9ee0934d870161f7f26fc3d0fbcc07fefa558fc55bca29e96259bba767a SHA512 260da5901d28ca2354d972e00ed468c9bcf2901f948cb7759ff3e9d3a7b67da90ba754e555d6695c5095801b106ffd422459f0860b901a75e01575e159eb8f48
-EBUILD uritemplate-3.0.1-r1.ebuild 667 BLAKE2B 176a989cbf0c051b9f4a411d9c302338de66479fa411abe6da8bffc318b1a9b07984003b6e9d66fd3ee3785622ae9e688fbf1fac9faf154dc6beeb63738d6c27 SHA512 c87224ccf2e815bbe1d2c76093ef2800dbff804b8850ebccb00a2970b35eeeff62d7f4163c136731dd1b3cac8e2a35a56267a976378b91f3123d941ee39eec25
+EBUILD uritemplate-3.0.1-r1.ebuild 664 BLAKE2B 2f50868bcfe3aa67f132515b6ad423566262688fbd8f42b5fb05db95ba4619a07e47b9758136cb3f90628a80f5480a4946576d03fc4e4b04d5d63e0262140e33 SHA512 d66f61326d31d4b7d8341c4ffbdb4400722bba92c11f1b06e35ef3841a2217ea515d145130bd25e182f337b592e42f5a8135b0b556d7fe3627aa9f621e104ebc
EBUILD uritemplate-3.0.1.ebuild 548 BLAKE2B 70c9b5bd863dcd1427231cb798715a06d3d00014661d01ae3b39aeb1602722385862b59576606e1622d1a17e1bcbc1defc566288664f0addb37157801f1cd3cc SHA512 5d92b7d79ec2b0bacf65d6cbac85e44d604094f684185e350b81b325e272980ad7ee56867f7548fdfad67655625f22620c4a0c35735a51d96f60bdeacd9228ca
MISC metadata.xml 324 BLAKE2B 2279bd09d0632113a7f87be6510c579d6fb0ab9feadf54b1196b68591c3ce0343e26d862cf045261b52ef9b9a535de1416d26a57ec88f82189bd7a9dc3df285d SHA512 ea995ed18707c72981d9174d1a35a30b0c86eb9035acd9b229766d0c0e5e2baf25ccd2bdd1c5091e58b2dae799643c1af81a3fa18b66ad5795ff50595d27a51e
diff --git a/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild b/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
index 250a5e8d801c..8f82d9943f1f 100644
--- a/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
+++ b/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 16134f42e692..3c8e7cb55544 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -3,5 +3,5 @@ DIST urllib3-1.25.8.tar.gz 261077 BLAKE2B 9625c8bce484e3a0ae8b49a776377d5420a496
DIST urllib3-1.25.9.tar.gz 254921 BLAKE2B bd78d7a1de71ffe3b1f62352bb49f94fd402870f57e86ae07ea5462706c19b0ae1f8e23a7e8a4a83482b57e007cb95f5ae242d179cec7e9568fcb440b9d95b82 SHA512 505f1d9137e469a48ee0de417f2be36946cf1d9bbcf1233280be399a6c6d8650b5b3c6cfcf884b04e0156974da703f48843381b9aab377738a2e60f7d2d3799b
EBUILD urllib3-1.24.2.ebuild 1786 BLAKE2B 3c413607941e08872efa7f4f598e69d6a858adea7505b183ae2efeb7bf418edf8b06fbd04d0f3aa640a50f9ee18616f8b5186f382fb8fc6f250a667348c7d088 SHA512 4f217cb09fc22adb26371a336d42c274be4ca2aa1e8ea5404b8ac97f573b7d7f6c577b8e12a5f9281e1df39e4967614c8f9d9aa626c3544bef20c86053f1a95e
EBUILD urllib3-1.25.8.ebuild 2536 BLAKE2B 1a5167611d39195efd2367a47f709e4e0350f879a27f90ef4ede33fc5c167aabd1b3cfca4e24177649e2a1b12cbb1924860d2ee930bc683d581dd3d857d7be3f SHA512 c257bc9443f3f5464c5d33a79cace27e9305bfbc2b1c2e374a46613cd5d926acf24b298bb79b4fe55a30ea816f6b41f8f9fd3b16fbe129b96e48e45e8ec2af4e
-EBUILD urllib3-1.25.9.ebuild 2108 BLAKE2B baf4fc80008da78cbecfdbd23bf43eda778c04df3aa4b833c8da23505a1e01ce2844e719c917715ac5c2ec5f9fdee8120cc25fd4c32e81da745489fd05a431c1 SHA512 56e0175d192771e81513167872a0df697ed6fab1ffad6447e6ec11659656b3d2052e117290c829a2202d7839c439cfa1a0792c2cfb27bea0dd410e859cc2165b
+EBUILD urllib3-1.25.9.ebuild 2105 BLAKE2B e1a6631e8091414d3794284d16bfccdbaf36d6c119851db0a4eb1649e2c87eaf8d63512a95ff64b1df1fd6c466e226fb0b6f62298e44d0880dd8e0f76a923203 SHA512 480c0b41cc9403a6100870b2eac5c21181b7c70ae9a3fe5213c38dca073e0aed8f9b4bfec42c721d5ab3313cb761f2aed358e98561bf41fe895ee453aff34a59
MISC metadata.xml 523 BLAKE2B b5104cb8130aa670af99f36a2853f4ccbe78f367d5e80a3626a5323237af5f7da1ba6fa5d83586afa1072753f63d918197aa97a578f7e2f1faa82f457c7947a9 SHA512 3c384cd1d75e038ba7b7d3aee93f2f9cc05b61710cd6f45f2f250392994caa253b6c783ce5f321dc72a94e1e94e12527a229d652920492637dfca4eb7b13c457
diff --git a/dev-python/urllib3/urllib3-1.25.9.ebuild b/dev-python/urllib3/urllib3-1.25.9.ebuild
index a3c2ed92451e..13f413e8d83d 100644
--- a/dev-python/urllib3/urllib3-1.25.9.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
IUSE="brotli test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index ba8f7dfe6c65..dbb9762fe29a 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -9,10 +9,12 @@ DIST virtualenv-16.7.9.tar.gz 5116740 BLAKE2B 10b77c4d74d3b1be60d567caf60b482748
DIST virtualenv-20.0.18.tar.gz 7982748 BLAKE2B f759ff1c42aaf9229e3f8dedd7b50df12e3a7616f979e18a5a91d58afd190beea86c67e0f7c530ba327427f3a4967ab27d7b922723c9ce92cba844946f8eb8ff SHA512 9295acb4d21da13c93fcf2a73244137a6fd8384313cf2685b67295f3be8cf33aaf6d22fc9ba4fa93dbfd81429eeaf4eb46d752fb717f0f74c172a754b92d41e6
DIST virtualenv-20.0.21.tar.gz 8036935 BLAKE2B 63519368c951989a4112abd77bc8dbdb3548872ccd2da8c8fb8ed0d8dd2b99271df4b666dc5618eb4ccb650ecefff07d57e47ba6ce56c770de432e79f5eb1931 SHA512 168bd977bfecf98b76a20c6059fa372a3a9681e778539d962c7062a19ffdf3387c89eca50e03a4fe83ff2ae8affaf8ec3f87141d0c94240ea205df329a113651
DIST virtualenv-20.0.23.tar.gz 8038565 BLAKE2B e11a7e36c33848fc9c8ad12fed369e6804c11a89e11cb66ff105b4e4e5758dcab15809932f88d9ddbc229d1bb862d29dead9ff2e4da655603e627887a1a2cd1d SHA512 01a56564ac09abca25cd163e7b425d8dbf1f57d6771b57e1f5fe4182f86197009e7ebdcb6f4a8640c8b8f0cdfcfdcd843f7be33848c66b0b5877cc7a8fe6ee0e
+DIST virtualenv-20.0.26.tar.gz 8264088 BLAKE2B 0d5bfbae10fa7de73ec3766863415a5a8f6680b168ef4ef25984b91a9291645189b987bfc63b96897b6f421fd692b4a388eee7a36995b0b65fe52d3019813da4 SHA512 d81fa8f25b7752fbb76494cea62f76d5f40e1397853ef71c1eb8078ffe8748fb365f275cc34ef04f64a001e3300a6f26f872542f68c047bee1eeb74cd49180a7
EBUILD virtualenv-16.0.0.ebuild 1229 BLAKE2B 1471e961cb3e6eac155ad7c7aa761ee6fc3cc067f043c05f0dabcad30cee98c9689bae08e4f37a05a4a47c0627bd8d124be23f0804952b564309cd05a6e5491f SHA512 0204f47949d89816bba0295b24c076ec375f31e19071ffcccb3f0b70068c88a12fff97e292ed636ac9b0edda5bc5ba4f912d6486d30c3f3956f7456771eb4120
EBUILD virtualenv-16.7.10.ebuild 1759 BLAKE2B 404fad7b07ebf2ec656f401c46b445c18be0e622f663808eba2e0eac76b26bb44dec59dc0a4f38307f0293ec6a9be58c7205db4c8fb3c181d58aa4af7cb1d11f SHA512 a439652d37591c148042402e1e467bbaf9c9525107112e939996c7376fd2569bdf004ab13f7eb9b967e7b517ced58fa7f18f2e3b6bc18eb33f739e80af81a518
EBUILD virtualenv-16.7.9-r1.ebuild 1828 BLAKE2B a6092602da117163b2b6b7882a7e2fff1acd9334c5150b8d9f7ea37b5855dda60924d374e3b3ecc4f2426f3a0d426ec7dbb17a9c577f4285f499123ccfd39b62 SHA512 0c714cb640d21eabb8eafd0c641989b9d896748889f987b381ec137d15da79dc1caa757ef94ef1ecbdef790d9018fc8197b4337223b85eca4821770eaaf2b35f
EBUILD virtualenv-20.0.18.ebuild 2272 BLAKE2B 0ae1219c1cb9d17e39912cd4963a3c2ee8898e71a61e894ab453e85c50926a2721be52a26652028a30decace9d4ad0eb0f30ba3d569e19d132e0472728f16cae SHA512 989f04d992e7699038ded65a15f5904fd077b6037b49711f0df91fb8b760207b2abb967fda53d2aa684371bb9dd38f30f2189be2d4d8e7de78c7098dfdde9768
EBUILD virtualenv-20.0.21.ebuild 2597 BLAKE2B 0f6868368b0babd66fdcc7411f50bb9b3899bb75babca111e7f61610d3af7f1b84975a98f8b99ab36c1c42713931384dc3de0a7fa1b8218f91b3b201dcf12028 SHA512 b31cab9e92aa539977242293fa58392c5ef7826b85371f0357264b6e5601b8afbc9152ba365a99aee05de0728e4bdd1057d88191f06eb174b4e94394095d78d3
EBUILD virtualenv-20.0.23.ebuild 2582 BLAKE2B 5c6421e1682a7878d89e40754b1a9445de3f5da7503ddbaa2b728499c0c1bbead6e3f6c1239950778a4c0c181326193e7d7dfc79aef5f0142ce24a7e4bf4828e SHA512 52bcf6f1ed5bc14634d31c250948efa486bfa9c25bf69f958fe3286ed43ad1f9e5ace94288907465e2b4d8d9da8f82669cdec7f2ef57056a3997f7bcb41c389d
+EBUILD virtualenv-20.0.26.ebuild 2506 BLAKE2B aab14ecf61b31e9dcf6945d576df34f8101184e60173eb09ffc568a7486b8bce3338abaf2a08671eb9a6fa1b7866402e0152db36b62216daa2109620388676c0 SHA512 b82c00251e18f598f8bc9f7aecf9897c7e338fbbbc9b97eaf89f2529be61346ca3636df233c4b147da03f7f7607e2f7d4e08579a805f567542add7b92e7a8190
MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-20.0.26.ebuild b/dev-python/virtualenv/virtualenv-20.0.26.ebuild
new file mode 100644
index 000000000000..7ee318de5ada
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.0.26.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+ https://virtualenv.pypa.io/en/stable/
+ https://pypi.org/project/virtualenv/
+ https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ia64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+ >=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+ >=dev-python/filelock-3[${PYTHON_USEDEP}]
+ >=dev-python/setuptools-41[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/contextlib2-0.6.0[${PYTHON_USEDEP}]
+ >=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
+ ' -2)
+ $(python_gen_cond_dep '
+ >=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+ ' -2 python3_{6,7} pypy3)
+ $(python_gen_cond_dep '
+ >=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
+ ' -2 python3_6 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ $(python_gen_cond_dep '
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/flaky[${PYTHON_USEDEP}]
+ >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+ >=dev-python/pytest-5[${PYTHON_USEDEP}]
+ >=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+ >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+ ' 'python3*')
+ )"
+
+distutils_enable_sphinx docs \
+ dev-python/sphinx_rtd_theme \
+ dev-python/towncrier
+
+src_prepare() {
+ # we don't have xonsh
+ rm tests/unit/activation/test_xonsh.py || die
+ # require internet
+ sed -e 's:test_seed_link_via_app_data:_&:' \
+ -i tests/unit/seed/embed/test_boostrap_link_via_app_data.py || die
+ # TODO: investigate
+ sed -e 's:test_cross_major:_&:' \
+ -i tests/unit/create/test_creator.py || die
+
+ distutils-r1_src_prepare
+}
+
+src_configure() {
+ export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+ # TODO: fix/skip with more granularity tests on pypy3
+ if has "${EPYTHON}" pypy3 python2.7; then
+ einfo "Skipping broken tests on pypy3"
+ continue
+ fi
+
+ distutils_install_for_testing
+
+ pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 7303b024a510..360b616ba309 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,5 +1,5 @@
DIST waitress-1.4.3.tar.gz 173767 BLAKE2B 4d64279c69403347c7048024b0c70f8192af5fd5ad32f873d66ddae53b011d1445fa2d8f6db0f98ab86bb92855c8882bca4903dbb3657bbe86e7cdbf6a9b67e6 SHA512 b4fd6d174fe63d83686708ffb83f61421e94cc6c6e9ebc7deeae93ea50a0c11ee523d4448e602ba03ade942912accb33d482c13a367d7dcba61ba6b4871bc3b4
DIST waitress-1.4.4.tar.gz 173124 BLAKE2B 5521b6c983cb23bc768986e9e8d19e9fd94b1dc632661b0f136cb60176b8c9a81306b8c9604b2a5b4a1a821346cedfcea281f49ecd81686a944f60b387e1cdf9 SHA512 87d57f8cd241e3c88c30a34351d57255dc1388b5ce1bb216e1b94760db09c1f184d20ea5797b20a91bc2cf0815b5067569099f4639291b4a79e885c0ab8a9fd9
EBUILD waitress-1.4.3.ebuild 579 BLAKE2B d3b5bc9b454dae714b1dc0e602016a051c3b7f82ade431153fef929edabeb6abdcbac0ca87ca59452ad27d9d4c79099c3286d1d35db0a87e764b8c53f4cc4f14 SHA512 136f1fcd0acca762d447f5b33113f6adc33ac5ee64ab2fcaf13a8aabe0ada16ff5120414732f0fcfbbe31bcee6b95c6c69f58ac1dfad3a2cdc4c9f4aa0d9bbe2
-EBUILD waitress-1.4.4.ebuild 675 BLAKE2B bd805b7c524f6adfd12f42a0e0aa23a2dc81525aae8eb4db634651f45e967d25cc262234ed4c260b053e95b751fd7e654596e87c95bef0b815c4a7afac48a8c5 SHA512 3a1d942eef953301cd6f089ebc5642562f271c76bae6599bbd313f61593ce024a35faaac03d1e2d236ae9226c748f8bb32d216ec88203e949d8f06abd618aea7
+EBUILD waitress-1.4.4.ebuild 669 BLAKE2B 79c3e0352064721c664736bfe41ab589cadd55e18ba649256195e7595bc35773233ec6be5a71f943efe24994ab97c6760cac5b310e800a09c78f72fe395f5f3d SHA512 bc7d26d364bf5af113d16c12fc309c582a63e4f94d6d6d7d96eaccfe1b788b2e92cd5e1955b4e095130dee0a305d819e508bda8e61146cadad5588cd3f96e4d9
MISC metadata.xml 403 BLAKE2B 7fd0afda3d808404b7b7836afbf014eda9746e3ea718bcbc4220b1a9f4d399328eee971e71e1cd3b64a0fab3621f4ce3be8632875bd5489caa7222482a774a68 SHA512 6d59404fbc08bf9bd67845c3febb4075de455b4241c221444831c09231636afb857823b747fc24cacc03656f7c310cedd426d848c55d6513f52eb558d919e423
diff --git a/dev-python/waitress/waitress-1.4.4.ebuild b/dev-python/waitress/waitress-1.4.4.ebuild
index 6ec338584415..296b2bee0904 100644
--- a/dev-python/waitress/waitress-1.4.4.ebuild
+++ b/dev-python/waitress/waitress-1.4.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="ZPL"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
distutils_enable_tests pytest
diff --git a/dev-python/wand/Manifest b/dev-python/wand/Manifest
index d75f1f366ae7..b602f2232be8 100644
--- a/dev-python/wand/Manifest
+++ b/dev-python/wand/Manifest
@@ -1,3 +1,5 @@
DIST Wand-0.6.1.tar.gz 10501178 BLAKE2B 76eb22363a20bc93fafae334a65917310cae82b0613b4b8b1eb749ef453268eb4413734ece7a39448d25782ce2ee8c63e71f9571707ec764851d82dbe5a6a6e4 SHA512 3edc4030130c1d03547d933f05eca4e9c9d10bdd527b1e41657a6b3f81d433da63fbbaddf63c726417f90335ac475508f1a467ee5e368eecb5cf9e94e79da9bf
+DIST Wand-0.6.2.tar.gz 10503865 BLAKE2B ad488a2d3d6b5801b20ca3caab884069cd5fb6913e04fb719885abdd49578f77cfc4b47a33235f4833463d75c01ad80e06c0687badb9c981a16c9c358c815032 SHA512 906490a0a75a4fc315b592fec12dea21cd40102c461381a79d5215c70ab6fb9c8a1e888fc478ea2ad006db6549dfdd2b7b1e01879cc2aba34dcc0cdd6ae2d128
EBUILD wand-0.6.1.ebuild 786 BLAKE2B cf8f2fb581dbd926c301b36028b72543629f169834d5743fe3eff6db52641a9bde67ffd476dce5beed8f1d227e98e9285ffdef6daef92701c962bd9774dbcae8 SHA512 01bf6309e1a1eed927b3ac4ce1fbfd34324d5ea1115d815f465cedddf587b379e90a9fd3d1a497200f38ebdaa0aa217c47375301b58c3934d74fabd2fa9f3f04
+EBUILD wand-0.6.2.ebuild 788 BLAKE2B 420a5ef0c4a2ea8467c743f54ed57b23525c7c93eff9f292241c66adcd7360fc381a18bae9c1617895497e6a10eeb8fcd46877a47e99f34ab933074d62083420 SHA512 e30871367c46c9d79d1572a8b91d3796cf98c42367d190ea92a9e465bd493c38f11d774e973ef5225b048a4d6f376373048911e1590a58b64c91a6c52848e264
MISC metadata.xml 432 BLAKE2B b4cf502cb70ef3ca2d5077a491e37fa6d610504ca76e1381a2220e734c6dc435f42a9a260805114e4803dcb8f69871fcb57b92ec9085734c7d2a06f0d7f3a040 SHA512 d5253cbcab45e68901d7678652329552082f0d95a0d38d797ac351f4419a77116ae18cdfbbd8561bbde14c9d99c6ba0b5ce0a435d34c10b99eb14288275709b6
diff --git a/dev-python/wand/wand-0.6.2.ebuild b/dev-python/wand/wand-0.6.2.ebuild
new file mode 100644
index 000000000000..094165125f7a
--- /dev/null
+++ b/dev-python/wand/wand-0.6.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+
+inherit distutils-r1
+
+MY_P="${PN^}-${PV}"
+DESCRIPTION="Ctypes-based simple ImageMagick binding for Python"
+HOMEPAGE="http://wand-py.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="media-gfx/imagemagick"
+BDEPEND="
+ test? (
+ media-gfx/imagemagick[fftw,jpeg,png,truetype,xml]
+ >=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+ # PDF support is blocked by the default ImageMagick security policy
+ pytest -vv --skip-pdf || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 1ec0dd88031b..ab55a081caea 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -2,7 +2,7 @@ DIST watchdog-0.10.2.tar.gz 88902 BLAKE2B f6fc6b9dd867a69139289fe6189f90fbc35897
DIST watchdog-0.10.3.tar.gz 89215 BLAKE2B bbe8a2ab3f84b7eff60d4ebd38ac928db85998910fc5b107dcd645c9b91388a9e45d317777f08288ce3bc2befcf9310bb7c8aef4f8e3309481919dc87e84b2a1 SHA512 6061b1393cd07038ee22271101bd6d5c847ee9732b14f63bbb5d94fba9f8273ca728cdc58b6f53a95d8213d0ed35bc71e8bb9c54960bf3aea2f64da066a864f5
DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
DIST watchdog-0.9.0.tar.gz 90597 BLAKE2B 4b83061f49204f13ccdb129c31bd53af256e5541d7a3f6452e59682ab64f37dc2a38e9a82ddcc2cec0ed5c52baed27d62b2fab7eebe2433d924209860b5d4a00 SHA512 97fca2642209150a611d931d6f2049a9941a3494a6c566bc18eaa45a8fc2fbd02c712b37a85cc1375eeb65715706ba6b8ecf781b99951721988c318f81eff7c6
-EBUILD watchdog-0.10.2.ebuild 887 BLAKE2B 4ff6f7b6e02352f34a22fe8259c6636a971bc07fa2cfdd5cea20332c71d4518bb2c013d01fee26bff3abb84cb6f4f5830ddc1511f111f6b9c664732c4c8f23d1 SHA512 dbb0853f88e75a34d59f0c56daa633371e9160a48c727b021f1e01a29818cfadf4f076a9e2dff2f3cf111e47ef250dedd20e95358c026c2f445eb59ffcec4795
+EBUILD watchdog-0.10.2.ebuild 885 BLAKE2B e5ab730671b85478750191853042b6acbff0455c2e00fa4f259e8cc7a2dcc599ce20f2332655d71f6e7ffa78f3f84b91ab1830eafb6071da670e98b05b108981 SHA512 d84f509a72d427b7e2d480f025641e8c21cc08fbf6b56c23346f1b6d80981f4f4efe42c300508d540f4edffb463d275126eb61f0e5dcdff76d6550e4126abca5
EBUILD watchdog-0.10.3.ebuild 887 BLAKE2B 4ff6f7b6e02352f34a22fe8259c6636a971bc07fa2cfdd5cea20332c71d4518bb2c013d01fee26bff3abb84cb6f4f5830ddc1511f111f6b9c664732c4c8f23d1 SHA512 dbb0853f88e75a34d59f0c56daa633371e9160a48c727b021f1e01a29818cfadf4f076a9e2dff2f3cf111e47ef250dedd20e95358c026c2f445eb59ffcec4795
EBUILD watchdog-0.8.3-r2.ebuild 861 BLAKE2B 070bafe08d44109c44a77efdd0efb94020c183c6ed6dc7fbf3f737b80b4a81f23555925ec800891b9ab5ec59fa0ad15fedc4e25198ea8aaf8eef39be6d28c039 SHA512 7150865640631d784f9edfb2d2034d9c6bfe7bffd784cbe14eadc6a5b4dd1e5271da820e94a2b280753d3d4c47b2ec317e355b546e18226496b8377f2405bc38
EBUILD watchdog-0.9.0-r1.ebuild 845 BLAKE2B 99fc184e8f2282d5e7b4291f7215bb6fc50accd843aa3b1b48150598bbf628ec9d37ab74521247de0d49f3fbb321f5cd518ecb6a04a0b5bfb5b6fb47c3f8bf9c SHA512 a2efaa1b2f6d6a8d21230a64deb919a52eb5289d56f94681bf3a10ca863451e9988f530bb64b20780d12fcc0b7c56c3e031b70001a6707b523ecea7c751f5562
diff --git a/dev-python/watchdog/watchdog-0.10.2.ebuild b/dev-python/watchdog/watchdog-0.10.2.ebuild
index 6420d472f83a..9af812bf99fe 100644
--- a/dev-python/watchdog/watchdog-0.10.2.ebuild
+++ b/dev-python/watchdog/watchdog-0.10.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
RDEPEND="${CDEPEND}
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index d9bb26e7862b..b1168cf7c08d 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -5,7 +5,7 @@ DIST wcwidth-0.2.4.gh.tar.gz 47355 BLAKE2B 152befc1f9e8630f407a78c70c9121dcbf27a
DIST wcwidth-0.2.5.gh.tar.gz 47514 BLAKE2B 0ac5fb08283c23039453408da2edac36e2079fde8fc903002785e2e0f8bed55d1d6a291181097f73e4ec8152b6eaa4f4553b0b39fe1cadc7a99bacb2d7e55d2c SHA512 3f1f1fefd3ee9f06ea2051842e8c3bb09a92501f031124b8514bec444eaa8594ab9649534b4264340d475716d5a6571dbe5ae932f685160defd75c19295e60f9
EBUILD wcwidth-0.1.8.ebuild 551 BLAKE2B 1d03df81db5ec03f284bb30d9e26722bdcbcc691c9d8af0ea705bc709dc11e7b17b8e72ae08669d0cf3537a9027feb656b62d297046caad28e3fa7a9f8956dbf SHA512 d1e11dfc2d0556a6823fb23c81e284b0bd1171a6ecb6b4d251965c507373c1df3974e79576652eda7b9dff5e108184aad64ebbae89c224cd4806fd623b319487
EBUILD wcwidth-0.1.9.ebuild 553 BLAKE2B 82ebb496ee479b35aaf0eee2c4fd155e3fa1c18f9d78de3f92cb05fb423a546558af0b91d5a94a67cb53455feee8cd52ca4c1edb8243a89926f8bf50eca1f9a0 SHA512 7f4d8348570e79a419c4a5c00e0aac3ac192589c7df7f8f5249f05fe4c8f8efa8b65894bac31faebef2945e48e8e7db2a39a0a95a1f11bde234343a4cbe6e116
-EBUILD wcwidth-0.2.2-r1.ebuild 920 BLAKE2B db6d3bf6acc5fb9c02b01816656ce095a10d0e77f15cbd6dba46d1c6265c5a6ba19d878439499d3ebb66a6451ddc4206694ea4d2ec5223a5f1b419eaa4c18a2f SHA512 f13a5e8a7e1b4f2da68bbb7eb5d55f58b1ebb73eca618b7926e324c712048df27414209c69673387b18e7fae58f90e847213305b20f71bb5d182257f2f394aa9
+EBUILD wcwidth-0.2.2-r1.ebuild 914 BLAKE2B 5370345a93a41b44d40d882aa9c5e3b4fcd059a9d75b9bac03c5b6743c2f2d90106fe15d531beafc25a34e69d83034cd195c7ec6565de231d4da93219683b37b SHA512 6a76a6964b7e1708109ccf3ff97ece06e2cba9a28c1c9cafa6b60ad37910d89fe90102d26b46393b974d290ca0a2d42c3c25e61c0613b8827bc6821fc0912a3e
EBUILD wcwidth-0.2.4.ebuild 926 BLAKE2B 65e5b8e219a822bbd731421d89c439948524be31be39ab3b614fb255419a6bf5aaaabc9c50f39f4eee2f37f09849227866552a96022ae7100fd9377aa2fa426b SHA512 ace40abcb90d04554135d508a69057ed6b6bbeac76737c4f6b92be6512d6439a63943d8cc48f0576ece6a26e0020d92d1431513e3e004a8afdf2dbdcf22f3846
EBUILD wcwidth-0.2.5.ebuild 926 BLAKE2B 65e5b8e219a822bbd731421d89c439948524be31be39ab3b614fb255419a6bf5aaaabc9c50f39f4eee2f37f09849227866552a96022ae7100fd9377aa2fa426b SHA512 ace40abcb90d04554135d508a69057ed6b6bbeac76737c4f6b92be6512d6439a63943d8cc48f0576ece6a26e0020d92d1431513e3e004a8afdf2dbdcf22f3846
MISC metadata.xml 401 BLAKE2B 539430ada34933bd8bebc7146f9fc472a9a6e076cce36d6e34026d54464da99cc520e3a473f246c807531fa7edbefec87cde6cb948c8d295f77aae122466a608 SHA512 d416016c92307a1ae828e8135fac401dca0c005d4d0739874f6cb90ef9c36b9f41674896f30298826b200aaffad674c985ab7d06f76ac8897e9dfe1652aba426
diff --git a/dev-python/wcwidth/wcwidth-0.2.2-r1.ebuild b/dev-python/wcwidth/wcwidth-0.2.2-r1.ebuild
index 42a66c084106..54b76a242731 100644
--- a/dev-python/wcwidth/wcwidth-0.2.2-r1.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.2.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index 5126a053bf2c..6863a5930655 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,5 +1,5 @@
DIST WebOb-1.8.5.tar.gz 271955 BLAKE2B e1d22e91e8e04c88d6adcb4dcad93e1e0c37b5b3894eee7c2b5a92d2eea41719d3b42e05916bb355a3ac9a2f7357fe791ce6f776261bfc764eadf59d4be37bad SHA512 cc0b956a7c3b8ae58d6002baf5c6de4e442201280468f8fc8b5fbd2c7f7cb7a8f46447f97b98a32a9959c8d1aa7a2a8a7b9d624cb27ca79b2ad1ce94f891801b
DIST WebOb-1.8.6.tar.gz 274606 BLAKE2B 0419e60faaefd4bb822387bf5624f77765c6ad528da791d54204b528b7c827d0cc506cbe260ccbfc7d23ffef73132254dcf133ffb1e0377d75ee5ae83d4deb84 SHA512 b9a3faac114c55f3e9a6eb71a78dd921d928da99a427dea05bc798bc1fe249f0f1cf8c9b9fcb1b73be2737b9132bbfe2250a8652e3a8a1199ac74fa62a59d44c
EBUILD webob-1.8.5-r3.ebuild 779 BLAKE2B 0e68feb8b835e93a8460a6dc34d5cb213dfec4d79d533f213f08277a5588b8a63646c9a7f35e924f17f43bbee9f997b121336645cf7279b5466596c4e3255991 SHA512 c0dcc0f8fa35144c7a76be4d48e3fa8601d237bbb14ccd9fe156aac0305343cc7e3edc062a4a898c4bbad4961dc0e15ea9fac70526d55509794b58b934e4bd87
-EBUILD webob-1.8.6.ebuild 733 BLAKE2B 4bd67b469fe046eba9390ca4f52e3704ad7e9c9aaf8b63ea9bd59c2c9ff510b91b5a64caa079e56fc41f9c538c83add08ffc8af5c7799a97f1e35e12a863b134 SHA512 a7f9242a92edf25cfb7cf2452427152818fddb6fca21e3aa123ebbc50ebed9259441459c22031158b7b9822c71a7a4688d9e7b287d8c418f0a4abc35e14306c4
+EBUILD webob-1.8.6.ebuild 727 BLAKE2B 3b7e6d548901de95975a946e870e463636032575cf4003b6f509aaca0459ab8b0b8fa89cb262930ac84e0bc35c887478cbe4180b86266ab3d2a626d5ca865ba8 SHA512 da51675a6c26508a82353f864bb9739af0f269dac30be454da8993932c6a291534a1c100410c981c08da788cd7add10cb6b69cec54be0edcbc78a6ee75796802
MISC metadata.xml 444 BLAKE2B 377d112b1afec6a033f7688d73d92b4874b31f9401df74624d34870ac4714566019391e877cf1fb10ba1176d3979fb1ca21980b45a96aa7039c9de8e2b495893 SHA512 e180ffdacb38455833badddad5dd9c022d4f20b175f3ec046eef9530d44f511a79ae00743e966246756422645212ece6c142c3e05fbd86b391618eedd827d885
diff --git a/dev-python/webob/webob-1.8.6.ebuild b/dev-python/webob/webob-1.8.6.ebuild
index 0be6b5b7041f..c985d4d4c7b3 100644
--- a/dev-python/webob/webob-1.8.6.ebuild
+++ b/dev-python/webob/webob-1.8.6.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
distutils_enable_sphinx docs 'dev-python/alabaster'
distutils_enable_tests pytest
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index ba9a9b21fc78..2b19249a39d0 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -3,5 +3,5 @@ DIST werkzeug-0.16.1.gh.tar.gz 937876 BLAKE2B e5f962e9cab4a06a6f2d63ac35df896ed7
DIST werkzeug-1.0.1.gh.tar.gz 907482 BLAKE2B d2dcdce8b1bcbb177b52b0915f2c0ac17d235dee3c77b23e81e4b35412d1f53a194d3c7c7f2a5c065ade99797effe72cc464cf6980b12c761a8a919338021660 SHA512 ba82120fb3e96e3a1334c6452d5ba1950fc016d2d147d643bbc2168ccec496f1dea799982ae8c578167155082c0bdbda5d56a23f64b4b6865f97e90e22df022e
EBUILD werkzeug-0.16.0.ebuild 1173 BLAKE2B e3bccc385cf6fbf35d2ec9dd5a162816756af220f6b272ce8184877deea82bbfdef159c7dc4da20f9201d193ba3b66e338dd68e978c66876d836a32b21605147 SHA512 14365bd1768d04ed2968043e74945a36ea3ca879b83125f9d21dec62420dc6479f09f8a70196491df4d6d81bd45e01ff664be7bb353fc50f541840df643fe612
EBUILD werkzeug-0.16.1.ebuild 1001 BLAKE2B 90c598018f5e117d58af89ebb846e4fe4bd30299a3898a0f27fd085a891ab9f782fee565169bf03a40f8d385e7fc4bcf41ed220deef3de50c5f290c5679d3d29 SHA512 409bfbf53b3d73e6364a9277f2eab5761da10b9af3a82e0f74620cc520f8e32d7e7fd64d30b0b816e6bf5792e5c84cf52e6e522a5f20f2e3ef70972f3c2d4250
-EBUILD werkzeug-1.0.1.ebuild 1361 BLAKE2B 100b836e5e9d67881c84cbd9530a0a7bb7e5cfaf67f29e26c8da45242351bb6b1140b85301a43176f5f89a262c078fed04c02e333fcb4e20b18aac08d7c47ecd SHA512 3f29354a35257df34a2c34b94ee3ac4397c60852c2aa3735f6c7f00816ff895868e3879a5c5a1584bf98515278b62bb8fba991500d90c61e4393e81c1c84b76e
+EBUILD werkzeug-1.0.1.ebuild 1355 BLAKE2B 43eb943d67b2045389055780f8da77bd10338d3cbaaaf94329323cfbf973d8dd240983a3144bcffe87e22568b5e32f9b5e2ff6489ac168a789ec7a7d82d7bdc3 SHA512 92e1580979ab1fa7b54c6a6f94b3b34b73dd86c1cb61d3f56e228c7aae5a4794e2932b2d69f2473c3b971e09ce7f2020f22633d3449f0d748fe5319996e1e880
MISC metadata.xml 321 BLAKE2B f2d43f339f0bc82cbc2b0081d1c571cba47744e59bceb960e0a9708d3401445e5d416fc3fd956f6bafc6d8e1d9309eaf5bdfc28e938f5450a9acc1b80cc88b9c SHA512 8c4768582ab693e8a95ad3cfb28b7ed6d7b926700393739c05b50a0297a31a37bad4b2b3ee388a963820258410dc8e2af2a40436821009c746916d0969b1d97a
diff --git a/dev-python/werkzeug/werkzeug-1.0.1.ebuild b/dev-python/werkzeug/werkzeug-1.0.1.ebuild
index c9eebbcef2e2..ade98f166ab9 100644
--- a/dev-python/werkzeug/werkzeug-1.0.1.ebuild
+++ b/dev-python/werkzeug/werkzeug-1.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/pallets/werkzeug/archive/${PV}.tar.gz -> ${P}.gh.tar
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
DEPEND="
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index c6bb92365084..8f4a2afe63b2 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -3,5 +3,5 @@ DIST widgetsnbextension-3.4.2.tar.gz 1103610 BLAKE2B 1cbd08dc1b9e4a8350b2d3a6e21
DIST widgetsnbextension-3.5.1.tar.gz 1112877 BLAKE2B 9608a4bb385e697685383e52ee3a17127b87dded4e8edd22233ed03ec837818798a8c08709a83ef7c13995797ebc1b43961e2bc8592e542c5b4fe7c2f5f08f7b SHA512 484f6d91e36ab734c02675973e9007b1f379f1a1cb762c863ad0d80c8c6eb8c9c49a138b3280894ed17ed86775f517a13790cb4537e1cf8bcbdc57e72d13cc2b
EBUILD widgetsnbextension-3.0.0.ebuild 479 BLAKE2B 779446ca8c8a632a29d251dd2b396cd962f779bc018e22cd524238ab2f9f30d78517f0bef710a497417fb5bf755f23520057e080b3a1a3a566cdb85f0c27bc0c SHA512 96587904be55684d894ec1536cedc388b1d3962bc0e9ee7d5de87c56b56d431f4e807d973c890db596052d30ddf71b16af1ced128f5f29e5baba52712ab9dca9
EBUILD widgetsnbextension-3.4.2.ebuild 473 BLAKE2B c8027dc2693c744a82bf15dccb866c2d5b2ac331ee4b6551413061dd851e53befd5eca5a1b4354781f658bfc46fab7d256b1a2207263599c4f6eb3b6e3d1f81c SHA512 9d378e8dd0f2aaf1f256789c858dfae15312b3404d20676857fe762c5b3c29f330a0902b03b00abe10d634e8d41d8b1b12f907a9858c1dab41365755775a8042
-EBUILD widgetsnbextension-3.5.1.ebuild 482 BLAKE2B b6a9c8cf3b7a2dd8b044b3734cbefad035445fcc2b4488321fc463dc94482ab76a3d737124dfb01d75818b9373b86ee0ebd606f1dba83f160f394a38edb28aec SHA512 c96566b4d15c612d1161e6c51a87316d664eb32db497bfd617d988fe9c2c8a27b40d1b01ccd93b0b0e544c88b49a55935013fb2eb91af4ac6e15a70fcf81b240
+EBUILD widgetsnbextension-3.5.1.ebuild 481 BLAKE2B 6a4ad901470a6bab25e4a7688da7d63c948d65097516cfa213988b0d2aaa287915cea2560e8a1a57e06e711374b12146a891013029131089a0060bbd61231b45 SHA512 89acee3b728eaa5fba1d61edc2020e856b788dfda2e39bc5d8df4a70e617e4148045be768e4468057a678c60f4b90f469596b0548d41887baa8dae4554d39a89
MISC metadata.xml 519 BLAKE2B 592ea12fcf1d68154b5e993b0aaf5370e3675c6fb0151800b777e36d35e93f59d4126167b6a00c7ea0c4fd08469d0a5d14c9fc9c5ab7759ea839057d021e9824 SHA512 abe9fb9ee0902e30755d996d2886ce34419bc6291feb9c51a91d374675279fc7e03850c0a6f319a034c5fa5288797747a67a5b248855622e15ae9444264fac76
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1.ebuild
index 28147f8a5302..52f3158a72e7 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="dev-python/notebook[${PYTHON_USEDEP}]"
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index fd1d0b6afeb3..11ef02408c99 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -2,5 +2,5 @@ AUX wrapt-1.12.1-py39.patch 8250 BLAKE2B d3f40b0ef14dc61a12b4e386d1b14b5f5d7f944
DIST wrapt-1.11.2.tar.gz 124874 BLAKE2B 262518e097753830d80d834e1dcd5afe9c743e7cad8fad992146829255b99ef0c1a6d0344674935bb6beae9a8e5f42a1a4ade760f7300d104b1a17bc6f94f91f SHA512 2551247c46fbc34068e0f2d6efa91d8c87669c8bf1e16c3b5e2e5e0d84402301c38a78485b7e9a13120c99c9c942db680a84d87a52a072d530aba6444d86297d
DIST wrapt-1.12.1.tar.gz 126750 BLAKE2B 92aba2d400aa626445be68fdda2831132e1c341a2f20065b3d7071a2ebc174cb9de7e6a20a8375360cf7df181881fd20b7b2f70dbfdf533e8823982eeaa722f5 SHA512 33e964cb3aa2437bc7d084a98f622f7c5c8c719d97806796ae0317d35130bdb2679a9dd87be7077e2cae1eb32b65d152349fa7cc138cb392d5999cbfdcecc9ac
EBUILD wrapt-1.11.2-r1.ebuild 711 BLAKE2B a10d2574450e0b90382a0f5d518785492fe071dd93015ed1b760d6809bf221babee875b73218675be73d4e8bb32ba9513ec8b81a5573cf2760560db61596bed3 SHA512 4cabf49d48a79d852b920bfcd948cf5ad89dfbd1075f0eca224e893459fe28ed736499928b1fef83f3026002d23858c3373495196cb1b106144e2bbfa2ac961a
-EBUILD wrapt-1.12.1.ebuild 773 BLAKE2B debb489dc37260573be7c5ddec7c03276ba9b5ff8f69e3ad4b816489e34b63753fb6ffc3e26b586ab88d38b33277262e150e08b0eb6fb1aba5f1f7622efdca7d SHA512 c29d7592cb02f39a0d38a1681f4c96e3cce41f74b51a5047c9272178073d987ec0aeb205f44c29e70aaf1dfb71f79b161a84d4223694661de0ff352695e0abad
+EBUILD wrapt-1.12.1.ebuild 767 BLAKE2B 51ddd96a454cf7c36d7f7e657d58d17d8882162e6170bee27043f1905fc62516a4970b58a74c5c3cad26a59540b0ae5d5c3ad335d587ba96dc216dfb2e038e4b SHA512 27dbd72707d0c513723ae2b433a54098831b93919899438444e7f1f06b7d13cf22998408877c3813e3e6921b25724afe9042807da2cb154b9a4fb9716539a52e
MISC metadata.xml 369 BLAKE2B 6a901e590d47a47fb9fe27cafa1708f61f0a3285b651ddcb138ee1fe1add01a163a031dfb9f37b6706fe1712a9da42903317a7560915be98524168e7dfee438c SHA512 2e999c320cf8b1894ef8efea6262304c7902e37692cefb376c36a16cf457133255a8f7c709e329232614fce918d65a82b61f2f340fdc277ae8d1b37c6d60a3ad
diff --git a/dev-python/wrapt/wrapt-1.12.1.ebuild b/dev-python/wrapt/wrapt-1.12.1.ebuild
index 477f6b207dc3..9691e2b3f931 100644
--- a/dev-python/wrapt/wrapt-1.12.1.ebuild
+++ b/dev-python/wrapt/wrapt-1.12.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
distutils_enable_tests pytest
distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index 6c464532a4ec..8099ba08f703 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -3,5 +3,5 @@ AUX wstools-0.4.8-setup.patch 648 BLAKE2B e2c1cbcd8a1fda7fc9a606add1a0171bb87b58
DIST wstools-0.4.5.tar.gz 201047 BLAKE2B 34c8d2c52ce9d1d67749ef6d0e1d5684a60718ef613688466d0992306f446b153d681b802fb142d1594bccaf37390495fb59e765f662e7550432d8866e038110 SHA512 24779bc2c2f3e32a515bc5690038e3f8e487fd45c1b7822d587e1bfd0bda660b837e3d5cbf8248459e06d7606e6d1c404dcee4de35b1f0d353bd5213e197d83a
DIST wstools-0.4.8.tar.gz 199688 BLAKE2B 3b5137dd135ec8f0e6d69f94275d45367e609adb9763624fcabb899f84c6215c2df26485dcf32d44d6683bd97cd00e2d283cf9096b6f58414f2eacd9e8b93a4a SHA512 0f86e91a2de7333aaf5a58558a715edd6a0cf97150f6d0cae4ecf8e0702648a98e610aa6d3295444079bd616656efcb2823ae7c02c5c3ffcb4789548ac40cd0a
EBUILD wstools-0.4.5-r1.ebuild 821 BLAKE2B 21629f745d6bbffffa6495e5cef50c56e3bde0f5568fef88c5b47f7d5a3f7d3fef1c774926038f3e9415d5a31541392ad7bd42128926a11dd1e67d29096efe48 SHA512 12c38791953f9a72e971ffbce13ad500e46524cf27c674545c93f2ab51d782f29a9caf21753c18fba1a9f77cd5f766ab9607797430956671270d7bc403c60dc0
-EBUILD wstools-0.4.8.ebuild 781 BLAKE2B fa21ba75efb161e1c8041a232958d63801f86e1e5ccc111969d7f63544fde9b20a1f3a59bd2791ae50e5cf0301b449eda418551128ff0875f63c8d68d1e5b832 SHA512 8b648c5605444c137c853d0fe2ebe3d8757b444ee0d6376a4240f9e3221ad87a773fa7faa6f7d4d9e71746f481922f83110cc84a99ebebc89444294a6c353099
+EBUILD wstools-0.4.8.ebuild 775 BLAKE2B bed27811461e03a662211491bfdc8e4050b29d765d7583b95ad050ae35d53fa12d0ab8adeff0d12785dbbbbb851d4605c36a1bbb38cc2cb0e2f663396b3b0f58 SHA512 f2c793e5ac2b2583d309a1ee18f60506bdcc6ab1bfe7cf431ec70ff668b2e29b55ba627b9ec479678ece967c5ae7b867d19cdbad93e027b395609579fff2a986
MISC metadata.xml 405 BLAKE2B d69d3c4e1719405f04df6f365e85a006018c2901f07b60c5d14ec82c85ca8b976315cdc0c50d5afea0dbcaa433d688a8942214138d31e508787be95e94c135c2 SHA512 1048dfaeda9e0c1a2adb0d723efeafb6aad13d12aef2f5d88c5d23f5ede7b3aac3133272c87f2309dfe10022ac5e1ad4259b02aa37f5b4370fe3fcdb7054e2d9
diff --git a/dev-python/wstools/wstools-0.4.8.ebuild b/dev-python/wstools/wstools-0.4.8.ebuild
index 857203dfd07d..95caaf8caad5 100644
--- a/dev-python/wstools/wstools-0.4.8.ebuild
+++ b/dev-python/wstools/wstools-0.4.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 42cbdcd27308..ef8759cbe34b 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -3,6 +3,6 @@ DIST xlsxwriter-0.9.8-tests.zip 28345992 BLAKE2B 0cda3578f69ecb152d6f30da6f2ab9c
DIST xlsxwriter-1.2.8-tests.tar.gz 29222574 BLAKE2B 11a13c5fc4089c8c15dcaa069a6f044555426e71dd040a6abf1038fb2a33788744c80487abaf1da6b3c0fae2db55a389c0cedbac251c793dc828920ea55ee5b3 SHA512 2269235ad3bb243dd8be5cf33efb6503e08e3d7ac42bce042c97737ebb8a9db880db93c05bbb2708b0bb6c621cb11c91f3e7d5b4fa09fce88092b365910b1afb
DIST xlsxwriter-1.2.9-tests.tar.gz 29395878 BLAKE2B 010e3baf191dafe04b4c73986c7997048aeb1002515d24e104a241e7bc80c5e3e4e46b2454e01de72e23418a24ad981b758355dc77dfa1980265d5b119e7c247 SHA512 4680f2eaa96ec8063432f3f0642d27895cd462d3d9b664a452f8e2956bcd16268f41a5780d172cf61cd3951f1f5fbc2dc904ebef1e08e7f45269821a3157c7eb
EBUILD xlsxwriter-0.9.8.ebuild 952 BLAKE2B c31d7bc21c3364389e8e4241d68e180915c3a86db13eff01c33284262c9008e09513f49f0eb5d6b12b4f5a6fe98ff06ca2afe54cbbad3e1d917d37f740b0085f SHA512 cd1b9969918b525e4256e5a665021089af8aa9df7df21a95e4f20d73d9e54d05606665cc831fe3645c4b867db78d5a858a31dfa60b7d047fc340c23c025d4ee7
-EBUILD xlsxwriter-1.2.8.ebuild 573 BLAKE2B d6766bacf1489be00509fa75413578f32203e83a3e4b87e865b03d7f756d104adcc44df89901f40ac8bbd3f42ae7c8e895daa8bb7c654ea3a62f3cf1570967d2 SHA512 68dbc36b109efa44a713cba1aee16ec114b24522a7874bf1081381c1a67f8261612f9b6846d77cf8f77fbde5c9b56eb03ac6fc106d0e04af2b6c16b2095c7a2f
+EBUILD xlsxwriter-1.2.8.ebuild 571 BLAKE2B 7371ee874a18952deab026b05f9d4e6ae5776af3f1f9f046aaa228213a46645625304c29661b5714b827da40339fee365af313c7158ae7127972fdcd411d43c6 SHA512 5dd260a2126ffb6434e24d6f3c83dc80ff6cdad686fdbb518ad14d2bb23f8447ec1bbb42766c28981aab1bd70945ab2feefca073f125f86722a2a7308866a4fe
EBUILD xlsxwriter-1.2.9.ebuild 573 BLAKE2B d6766bacf1489be00509fa75413578f32203e83a3e4b87e865b03d7f756d104adcc44df89901f40ac8bbd3f42ae7c8e895daa8bb7c654ea3a62f3cf1570967d2 SHA512 68dbc36b109efa44a713cba1aee16ec114b24522a7874bf1081381c1a67f8261612f9b6846d77cf8f77fbde5c9b56eb03ac6fc106d0e04af2b6c16b2095c7a2f
MISC metadata.xml 385 BLAKE2B 29615c2fcc24b4ee0ab796762a67d1e1a09b4208b18cc13a000b3e7380d5e56c74020436801a41e33a74b0122c3c2872e22a643c1a2fc724ebb6064170ab5c5e SHA512 62eca3ef002307f383a6c074c3dd956d9035488e1eeaaa4b0e20a6c4d7c328568a2178478e0a97d6b3bfef0c9673a1ae2b58ea39e4e5a2c111b0a34c44398545
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.2.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.2.8.ebuild
index 11100a0ce79a..12bfbaf692ba 100644
--- a/dev-python/xlsxwriter/xlsxwriter-1.2.8.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-1.2.8.ebuild
@@ -17,6 +17,6 @@ S="${WORKDIR}/${MY_PN}-RELEASE_${PV}"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
distutils_enable_tests pytest
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 835cd0ddca7d..6a0af58626b9 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -2,8 +2,8 @@ DIST xmlschema-1.1.3.tar.gz 298490 BLAKE2B 70c24424fd6a5e87e07591451db920d22c1bf
DIST xmlschema-1.2.0.tar.gz 314580 BLAKE2B d42b221d2730d2b5cdab655269f7b885c72bce1794f12111b4110a80a1288e1996633ef5f00e9fc3ef7cd66a4267baffbdb6a906d0a0c3caf418d31abda93016 SHA512 1a6644b02e96beeea68bd737a4a66fd02693b4cb3c36a07e569a2b2c3e2b0db4fe01a475fcc3c4e5372c6000b27ef824ba5859215a03212fe4c0f2ec61f7103b
DIST xmlschema-1.2.1.tar.gz 318674 BLAKE2B 686b94846b9cc8bc3dabfea9c9171a186561a0ad568a2806f5575a0c5808d3542f4e2cb7c01096036f5a54fb839cbdd95077fee9febad4cd7a82ead445228e62 SHA512 6d27ea5aea227e35f25a34a651b27084844bca015ae60d096fe1879150efb681141c368cd38cf376a2f0ea28b265cb844f1de82d2d7f704e3c2db67683f2af9b
DIST xmlschema-1.2.2.tar.gz 318829 BLAKE2B 5ebb8749d56491e65a2c09b56e965ea6b3e9be3d453a01671fa0da065389ca4bf44993693517bed4ef9df22cb94b9398660a7a838405c1757ee1c6f40aedacd3 SHA512 51be4317530cd1055438a4bf8e484b70d8a9414da5507fd30ed506271317859e5255fc729ed9fa5df2230e2af049ff40e693c67a5062e61fda43a1329ef2138d
-EBUILD xmlschema-1.1.3.ebuild 705 BLAKE2B dc75ad7d4cf313df5b63a2ce5f7b5a0f8ce958549fd8ea9df180bfad8f1c86b4cbadcecb1574f94e6de1bdcaaf65b3f9e07998162508d170706644139762084b SHA512 77293b3009ff356dee9412e1389474fd8ca7a7b7d95f13480248a523379367874bd98b26923bff62eef46c0da35f8ca679acbf79628ebe4a12684239b1e7ddfa
-EBUILD xmlschema-1.2.0.ebuild 756 BLAKE2B 37a7a167f92596b068de0240b6920eae9293cccf6a714c19026ed8a46e87a8c727bd6a3cc7aa8749d0113b66d854eea2e9719dcf39911f6851cb3f72349f49b0 SHA512 2d0c6fbd5d0f0ae5618f8505e37b386cf77784b5b992d6cc36cbcc7ac4df9b60db7aeca59cb10c0006ee196e8ee143197f64baba9343418ee751760af4451156
+EBUILD xmlschema-1.1.3.ebuild 717 BLAKE2B 7081354bbd2d24024a42bc3e8b5c2c20f668c9c07442c46d793336c444fa5aa80c5b556ac0103cd3dd4a35c7464acb67cbf710b4706c2d259d82eb34943f6fed SHA512 7ef0c2536ae1119de9b5530c84df431ac1c3baa3ac411734cd8564f05176606beda3046bddc79cfe55220ed6139fb5b2c409074952c0321e60676a7da27a7b81
+EBUILD xmlschema-1.2.0.ebuild 752 BLAKE2B 33db1fde80a700297ba6a532c8f6b34ab634defc6efc32762b223ede5bbedc93eaf3e1cd68fc27062638b51bb5f0a65c43dd089788a3bbb96f502a2dfed92a5c SHA512 dcd5b0c2965aa286773736394de302541da66e84ada8d8bbae55e3f48e5714e00e5d370cee589a13493cbe32c6d1c02240ec2bd6f48afb62016d894b5e2c618e
EBUILD xmlschema-1.2.1.ebuild 938 BLAKE2B e83eceb1494b64c00db3c534969e9742cf576341369040631f94e7ede7075ea738afbdfbbbe5f2099600a9eae7ff433c7681e379cef917766f516dbac5c7431f SHA512 208b0ff88e8eb5fcadfc831b391aa30106a522a2e1ee592626fd0918a84362fadd7abe7468729670bfd32f4cfb3ff3cae467f2305dac1b7bc609c17adb479153
EBUILD xmlschema-1.2.2.ebuild 938 BLAKE2B e83eceb1494b64c00db3c534969e9742cf576341369040631f94e7ede7075ea738afbdfbbbe5f2099600a9eae7ff433c7681e379cef917766f516dbac5c7431f SHA512 208b0ff88e8eb5fcadfc831b391aa30106a522a2e1ee592626fd0918a84362fadd7abe7468729670bfd32f4cfb3ff3cae467f2305dac1b7bc609c17adb479153
MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/xmlschema/xmlschema-1.1.3.ebuild b/dev-python/xmlschema/xmlschema-1.1.3.ebuild
index 3cf647432300..8a05f1851e64 100644
--- a/dev-python/xmlschema/xmlschema-1.1.3.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/xmlschema/xmlschema-1.2.0.ebuild b/dev-python/xmlschema/xmlschema-1.2.0.ebuild
index 590f138983d8..8891b86320f3 100644
--- a/dev-python/xmlschema/xmlschema-1.2.0.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 3d8dbb83727f..c7dd84400fe7 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -3,5 +3,5 @@ AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405
DIST yarl-1.3.0.tar.gz 159748 BLAKE2B cd7844545f3ee749d1dce865e21065c2b8e0c1ebf4715a3f8ec01064e534fa5b8b872539aece8a7e3a7ae147942ff5e0dc1878d84449d8248fd8e33c4234e3f1 SHA512 58e539900e7754b0a3d41960ebe20d21fd7245ce71fccb31d6a1204298dd71cacd742b2cb2b4c49c3a9b28ce5c664c412334f29e23a3c608aad8018142ba3e14
DIST yarl-1.4.2.tar.gz 163521 BLAKE2B ababd1d35bca51a84c8d189266ef5d35f7a4dc65c84c4097a260e86fb838b1a35d2a639c1cf2a407aac8e68c5f67222aae6fa1f6cbfa5cb71dd851b385bae45a SHA512 036562b645d7b9b3ed4a749decb189587b41ab13b5dda5ff461b00eebadf1ecdbd8d5ae06932cc7d8b7ff551cd630f8671eb0f6c854b20996cda4a6897994fa0
EBUILD yarl-1.3.0.ebuild 830 BLAKE2B cc31ea0ccab8787c7b0a4fc50c4c4859b70d4bbd2264ecd5fbb65d944b5be7f4a3d77416643b447d4d85da79225dace6af20d9244cedd0c913f43b06cdadab65 SHA512 81237147ffab8d8497bb5305a766d656725c9b0f2d168e6f42c5b713f8a3feb3080d61c91ff0e33da531c081fe4837900e3876e11c8490efb33a183d123b8663
-EBUILD yarl-1.4.2.ebuild 727 BLAKE2B b9256d903e30bc0de5f1c0bf193de0298308c7dc90c15dcadbdfe9292b69053e7cea9ab50ddc48fab9cbb3854008a08ac6a0e775b042aba5fb273131b2c77b80 SHA512 4a3e36be601f4deed9780d1afe451229c58cf35060152efeaec24a1ba9968845b8f2fc1fdcb262471c3fd21ddae1518f49341e28a2b47b5832c3f7330c26e00b
+EBUILD yarl-1.4.2.ebuild 725 BLAKE2B f5fe2585bcbaf8366b2500cf0d233285fdb58434230830dd7c88b7aed99f8654efae9e440804a84b175840d325a3db81fc71a43cbcba5c70270542539ccbeeb2 SHA512 e7485f0bdff62290cb63752e5b24da1baa4cd7b907847e8a0c802524684b9977c158acbc21a8e4893d6a09128458a1bb6d59bad13d467a4a9efb461e5a8f257a
MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/yarl-1.4.2.ebuild b/dev-python/yarl/yarl-1.4.2.ebuild
index 33d927f6403b..4baf0f30240c 100644
--- a/dev-python/yarl/yarl-1.4.2.ebuild
+++ b/dev-python/yarl/yarl-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
RDEPEND="
>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index e5d7d236c685..cb95e938d255 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -2,5 +2,5 @@ AUX 5.1.0-drop-coverage.patch 571 BLAKE2B d5f334b7f5ec5df710174f9a3768c2d7400cef
DIST zope.interface-4.7.1.tar.gz 151374 BLAKE2B 87900329d4634456287fe0fc78093df02f9b0e27fe2fd9f6dc039253f5814f2a00936e0f49e6001754c192eed323cfad068cf863d3e52ed31bad6352d83e1d0e SHA512 cb99cdf9733cdd2fb6637163167da0073145db1ed1788ae147098a23a9cafb4d661368a1780a44a231a2ea9f1adfa4fd6acac423a4a8d9cf026ee3a603ca7767
DIST zope.interface-5.1.0.tar.gz 225400 BLAKE2B 6ad412bbf3c0327d2b8f37899c1e71fe4bf63c3840c9f2c7e776e3208ec8999c4812aaae89cb9a78724b40ef3dd883323b00eeccab44714eabef6c33c171be48 SHA512 be8319913222ada47a22559e22322ec12dff3adf17f45335d007c5aa3509d84a7d0a7e6c113967b91810b3613344b5c60e002eb740af2bbb454b2807de8dad98
EBUILD zope-interface-4.7.1.ebuild 1218 BLAKE2B c54224db04b685c17fa2e7b0efa9c0f1889dcbd30bdab3f6e161e18c4a9202650e6fe52f347a7bca280777daf56dd8f7f81c218c7bd746f7d03bab60f6ba920b SHA512 0b6754a822cf4f8180c5fd8930807d1eeb08992a9c527b892394fc71166883dbcf012320a60076eb488082697ed97707888b33a15e2473ffd32b92d06770eb21
-EBUILD zope-interface-5.1.0.ebuild 1283 BLAKE2B c7a9a4eef2a02acf83af0e101420b534602d503e07beef937e57df5707e57fde44b2999b707ee7e61dd14792e55feb8488697ed2f0ca8fcd93a53dd60ec2b034 SHA512 29ddeeab65890ab695b312505f0661577ffa53d1e8530b6016922f96ef16b07fe044d55308a2deead8e5efac27f322736c1ca28fca0b65154fbb3c530f27fadd
+EBUILD zope-interface-5.1.0.ebuild 1277 BLAKE2B 487b24e978e7e4638a0097fccf9dfc53d4142b9cfed84be1aeb381741499ea7c5a4cc9aff29f87dbde32ecc155b71d2369bb8a98249c14053eedccb5ab1345c0 SHA512 700934fee29d25fb865c0ac4d90b26c23c1562b451d5c5467af60b52e69eca26281d593ac882f381b3829a70f6a849ea06aefb5a183eeef38c6bc5da97b438a2
MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-5.1.0.ebuild b/dev-python/zope-interface/zope-interface-5.1.0.ebuild
index 7d263a4d011a..ee335c18c9bf 100644
--- a/dev-python/zope-interface/zope-interface-5.1.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="ZPL"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
BDEPEND="
diff --git a/dev-python/zope-testing/Manifest b/dev-python/zope-testing/Manifest
index f78526cdccca..7d29a269bd7f 100644
--- a/dev-python/zope-testing/Manifest
+++ b/dev-python/zope-testing/Manifest
@@ -1,3 +1,3 @@
DIST zope.testing-4.7.tar.gz 63474 BLAKE2B dc825849c288b9f8ab9e4edfe670e09aa49f28c64047da8e0fb36cbfa6cf24d70cf6a49ea8a51ca1831b152f3ffa4b0c62cde29750036f13c9f754df2bb80da2 SHA512 cdf87f95196880a0f55c740f6340286bb29e96e9273d0c645bbb50def54a0645cce22d971adba3f15ff57b1021a72749219af83abc4e8fa775fb982d8164791d
-EBUILD zope-testing-4.7-r1.ebuild 993 BLAKE2B ca655c07dd13fc76ff452a431c98f00ba6c6fd9e030b54462ab0ec5a095b423ff79dce9a2adf13eb4d71809aaa3f0f81abd980e15235cf997545268c8401447f SHA512 45330ae19ceb1533548cb6c4125c061f796c5e87bea3abba14a284fffa3164a77877390ff092470d4befae4ce0dcd2f1582c0e62e783e9af9675a453a140dfa1
+EBUILD zope-testing-4.7-r1.ebuild 989 BLAKE2B a2e2a58afcc41f8692fa1d1400ddd9d377e491a51530a03956108a3a0f5571828bd96e764dacadc3c753ee6f494e910ae1b3db91008df5b67fafdbd127c1f27f SHA512 ee4967fd0fd7d9df78b50b476e6543d67cdb505430e7594f2de7df991ca40b257b4f1ae128c3637ea93a767e44150b42cfcbe13c27683786807a018d2b948038
MISC metadata.xml 382 BLAKE2B 3931e1281c2947e5d4582aeb10a79579e4b3c7bddca959fb1f6a65f47cd1b42df2a54f8d3200d3ab4f1dba843b978a4bfc29a9cc23070977ddfee1a74b3c69e1 SHA512 ddd7e2cd30860e71eee851d969e3ea69f72edaf4dff87dba784925e203cd1f0fada3c51090291fd8b5aee8e715f097a0bd6be1e89abe37526f57dde529c5e61d
diff --git a/dev-python/zope-testing/zope-testing-4.7-r1.ebuild b/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
index 43f2959a1318..9a114eb70117 100644
--- a/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="ZPL"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 0d7d9a4505cb..6bf938c2cfd4 100644
Binary files a/dev-ros/Manifest.gz and b/dev-ros/Manifest.gz differ
diff --git a/dev-ros/actionlib_msgs/Manifest b/dev-ros/actionlib_msgs/Manifest
index 2edd1e5e3c08..b84f9e4297c2 100644
--- a/dev-ros/actionlib_msgs/Manifest
+++ b/dev-ros/actionlib_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-EBUILD actionlib_msgs-1.12.5.ebuild 486 BLAKE2B 6970b1a3cdebd529ddb3d70240ad7e1a9ef668fef6c1ba02017748b7d7bece14e092f6625c65b4cf76d1db3dbab34de465cf58506b29e383467a886e9b0b12f5 SHA512 ca009508164f25b6b92f6ade55713ebe8c9754af5cc384ea062f4e22df6c31cec6a3bd5ef0347a432499f1f2e416063381da135d2ad7fbcb7f6cf3942d4caeef
-EBUILD actionlib_msgs-1.12.6.ebuild 486 BLAKE2B 6970b1a3cdebd529ddb3d70240ad7e1a9ef668fef6c1ba02017748b7d7bece14e092f6625c65b4cf76d1db3dbab34de465cf58506b29e383467a886e9b0b12f5 SHA512 ca009508164f25b6b92f6ade55713ebe8c9754af5cc384ea062f4e22df6c31cec6a3bd5ef0347a432499f1f2e416063381da135d2ad7fbcb7f6cf3942d4caeef
-EBUILD actionlib_msgs-1.12.7.ebuild 486 BLAKE2B 6970b1a3cdebd529ddb3d70240ad7e1a9ef668fef6c1ba02017748b7d7bece14e092f6625c65b4cf76d1db3dbab34de465cf58506b29e383467a886e9b0b12f5 SHA512 ca009508164f25b6b92f6ade55713ebe8c9754af5cc384ea062f4e22df6c31cec6a3bd5ef0347a432499f1f2e416063381da135d2ad7fbcb7f6cf3942d4caeef
-EBUILD actionlib_msgs-9999.ebuild 486 BLAKE2B 6970b1a3cdebd529ddb3d70240ad7e1a9ef668fef6c1ba02017748b7d7bece14e092f6625c65b4cf76d1db3dbab34de465cf58506b29e383467a886e9b0b12f5 SHA512 ca009508164f25b6b92f6ade55713ebe8c9754af5cc384ea062f4e22df6c31cec6a3bd5ef0347a432499f1f2e416063381da135d2ad7fbcb7f6cf3942d4caeef
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
+EBUILD actionlib_msgs-1.13.0.ebuild 446 BLAKE2B 83a38172da3b6eebc908c1d776b2155cb88a2f22a0d31c7d97cb2e6c9cbb4dac96eee76dd0189bff1dfe3003482e8978c32f4fb478568bad8fb6967fc63dc0d8 SHA512 c5ac8309bf3f715e44820a0ec0ee604688e4657324238d88537aee5172598592afe75ff2c93364ef7e6f44a6c0c6fff828f6ed5879585723c80c0a4c68be2124
+EBUILD actionlib_msgs-9999.ebuild 446 BLAKE2B 83a38172da3b6eebc908c1d776b2155cb88a2f22a0d31c7d97cb2e6c9cbb4dac96eee76dd0189bff1dfe3003482e8978c32f4fb478568bad8fb6967fc63dc0d8 SHA512 c5ac8309bf3f715e44820a0ec0ee604688e4657324238d88537aee5172598592afe75ff2c93364ef7e6f44a6c0c6fff828f6ed5879585723c80c0a4c68be2124
MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/actionlib_msgs/actionlib_msgs-1.12.5.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-1.12.5.ebuild
deleted file mode 100644
index d658f6173f57..000000000000
--- a/dev-ros/actionlib_msgs/actionlib_msgs-1.12.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Common messages to interact with an action server and an action client"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_msgs/actionlib_msgs-1.12.6.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-1.12.6.ebuild
deleted file mode 100644
index d658f6173f57..000000000000
--- a/dev-ros/actionlib_msgs/actionlib_msgs-1.12.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Common messages to interact with an action server and an action client"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_msgs/actionlib_msgs-1.12.7.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-1.12.7.ebuild
deleted file mode 100644
index d658f6173f57..000000000000
--- a/dev-ros/actionlib_msgs/actionlib_msgs-1.12.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Common messages to interact with an action server and an action client"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_msgs/actionlib_msgs-1.13.0.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..727f06efdf91
--- /dev/null
+++ b/dev-ros/actionlib_msgs/actionlib_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Common messages to interact with an action server and an action client"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild
index d658f6173f57..727f06efdf91 100644
--- a/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild
+++ b/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/common_msgs"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
diff --git a/dev-ros/actionlib_tutorials/Manifest b/dev-ros/actionlib_tutorials/Manifest
index 21c9795fdb9e..dabb11506ec3 100644
--- a/dev-ros/actionlib_tutorials/Manifest
+++ b/dev-ros/actionlib_tutorials/Manifest
@@ -1,8 +1,4 @@
-DIST common_tutorials-0.1.10.tar.gz 12511 BLAKE2B deeb06317c0f56f2496277f488592ba056b82440cb320fc9ea6bd3d2d6b8828301ce03c2f5db9ed1871b4f6a1caa8c874a510c912ab89ef1d05b01f364ee09be SHA512 92a1eb5865ec3b4acc9e04a507f050d9568e583ce6d0a29f3c6ab37f4c2feb5149f1ddd6269ce1a310251f7b4cbfe8a05c7e4c6bf4c3ca21c15d84f1c6f0422b
-DIST common_tutorials-0.1.11.tar.gz 12527 BLAKE2B 679cee86aad711677d1ed74320832c7ceb6d66adb34b835a80ad536be7bff517a78ca43e04372de23b491f8156ea3a4c268b4661d74fb1c04130e39033e1b961 SHA512 a42ab4b95eeaf9620ae0987f4e1cc530213b39455dea3ff8d944ac24ee7ed8e321ac8ed4f73b8e4d8d882248a850dface0169a5d521b02b226e6d0cb6016a33a
-DIST common_tutorials-0.1.8.tar.gz 10591 BLAKE2B 7bf99e6a46ff52904f34f0b8e226dab10634325531ac736e530499af43ad1f1ca62168e476ef6ea9e33007c883804220b512e7683fed36e6940017624031f0ac SHA512 a0a2e8a7aba3415bf133e95e7d1b72cf5ee81efa962003ccaa2108fdfebd2a03044c60fd4daf73ca69f3a2975bd7fa9c60adfefc32d1b048da11e65aa613607c
-EBUILD actionlib_tutorials-0.1.10.ebuild 512 BLAKE2B 7e2a0e2ed6aa9adf69a5849c508a2da2a4944a2d5b09eede252671bd63f33a2f9af594783f852e4ebd2fe07537ffd378503fc1572df9b4d0a56386dcb1bac7be SHA512 80a38d4b14640d3b58c5ef893fe7627f4846a6d764fb4764c70ee7f92ece5d81e1f896f627f31e73a06d3ee393346911c9a6965e4b8bfc10cb166422f2bd5ecd
-EBUILD actionlib_tutorials-0.1.11.ebuild 512 BLAKE2B 92df94566b70d1f99559947535f819591265b978362df63c059fd16e2eda367e48a375e6251cbedc5319488e750c893c38373f27ae333be9b280fae4bac969cc SHA512 886a1c079e23326fd10bc0c11eccde179f01ac32d8862804d0bb4212442c581c51149338b7319b924bb7589fa14e88cb3ff381321fdba268d073b7d5c6eb0bf3
-EBUILD actionlib_tutorials-0.1.8.ebuild 512 BLAKE2B ff7e8318b4c18367c57cfa021b3eea87048ba13f4086bd62d3b43e21eda3f269c713f2d227111ae7729eb955878ca74c7e8b6b2eac51c68afba60e6c9083813b SHA512 a64362ce1310e632f5ccd88cde6c53a3aadc4df802102680e37236191a7e514b2f3b00c5a326a17102a37ecd9732ad5830afe2079e3a41262b684233e7be241a
-EBUILD actionlib_tutorials-9999.ebuild 512 BLAKE2B ff7e8318b4c18367c57cfa021b3eea87048ba13f4086bd62d3b43e21eda3f269c713f2d227111ae7729eb955878ca74c7e8b6b2eac51c68afba60e6c9083813b SHA512 a64362ce1310e632f5ccd88cde6c53a3aadc4df802102680e37236191a7e514b2f3b00c5a326a17102a37ecd9732ad5830afe2079e3a41262b684233e7be241a
+DIST common_tutorials-0.1.12.tar.gz 12609 BLAKE2B c570236517420685a4733d84694a03486798038f4b7a0e721179d602a6870b51afb558dedd64ed2ccf518bb0e37cccefcae701053eb4c5fe32ef3e2d5dc5d69b SHA512 37244290b0c84aff47172484e2f3c1eecfe3482856030a08e55f2d1b0cad903262be453e81780f58e250c4e1f24c06f6256da5ff1342617d7d5f501f38fc7527
+EBUILD actionlib_tutorials-0.1.12.ebuild 481 BLAKE2B b97dca180f6681633671f90d0ff3b0f70c2157f3bfd1df8db65327d33a8968ad44e75b6d6963a20192ed6534a4211b9a9e5d0fec2972c5e5665f600ec6e1a588 SHA512 a2980f7033949d2cdf838dc35178cb6507b02140ad80ae3ddaeb7c50375140ff6833253a1f546accaaa4c358bc47cd708ffbecde18f98d42cfd868b8ac9b8fb3
+EBUILD actionlib_tutorials-9999.ebuild 481 BLAKE2B b97dca180f6681633671f90d0ff3b0f70c2157f3bfd1df8db65327d33a8968ad44e75b6d6963a20192ed6534a4211b9a9e5d0fec2972c5e5665f600ec6e1a588 SHA512 a2980f7033949d2cdf838dc35178cb6507b02140ad80ae3ddaeb7c50375140ff6833253a1f546accaaa4c358bc47cd708ffbecde18f98d42cfd868b8ac9b8fb3
MISC metadata.xml 334 BLAKE2B 9448c76327ed1df85e94f230f66b62356f9f3f6e0ae2853cba879c3357bf19ba534098914207e4bca6e21b3a1e33a5a911084a5f83b9d9b1bdba8282bf70b6e5 SHA512 dcec72972fcaf9c06c0fcc8ed3825875667e3391de433ace73961159cede1a33c40f7dfca78ca22e018e730024af73562786f90fcc1f2ccf39ab11106f37d038
diff --git a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.10.ebuild b/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.10.ebuild
deleted file mode 100644
index e841322f5bd6..000000000000
--- a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Actionlib tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/actionlib
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.11.ebuild b/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.11.ebuild
deleted file mode 100644
index a2c7c31051fe..000000000000
--- a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.11.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Actionlib tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/actionlib
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.12.ebuild b/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.12.ebuild
new file mode 100644
index 000000000000..06dbfac86d9b
--- /dev/null
+++ b/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.12.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/common_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/actionlib_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Actionlib tutorials"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/actionlib
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.8.ebuild b/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.8.ebuild
deleted file mode 100644
index 4c7a233988b2..000000000000
--- a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Actionlib tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/actionlib
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_tutorials/actionlib_tutorials-9999.ebuild b/dev-ros/actionlib_tutorials/actionlib_tutorials-9999.ebuild
index 4c7a233988b2..06dbfac86d9b 100644
--- a/dev-ros/actionlib_tutorials/actionlib_tutorials-9999.ebuild
+++ b/dev-ros/actionlib_tutorials/actionlib_tutorials-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/common_tutorials"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/actionlib_msgs"
inherit ros-catkin
diff --git a/dev-ros/bond/Manifest b/dev-ros/bond/Manifest
index 47e26b804c48..24d06426d2f6 100644
--- a/dev-ros/bond/Manifest
+++ b/dev-ros/bond/Manifest
@@ -1,12 +1,4 @@
-DIST bond_core-1.7.19.tar.gz 31455 BLAKE2B 86b21d44624c0be8c9445b53d46541785d47fe36366e1d25305a689faa99577905730cd313b7789302ebc6677f85c361d8c51a523233ade11bd6b493ee986dd2 SHA512 63584fa465dba48def1c049e713b0438ea6dd15bd968ee5a1ef969e21540d2693eb61bffb40134dd28486c83c6e54d8db9c71af8f2949bd38a3f7c63be5b65fb
-DIST bond_core-1.8.0.tar.gz 32199 BLAKE2B 8b5f308c3ff4ee3cf4d969ffa7cc05433ab0b992865a782b9c63d8b27615a158fe1885302703aa357f486ea4409e9e07aa3b43bbef6d41fbd127a8bc2c7252cc SHA512 5519d5366d94403862f34ff16e06ead099a164e43987a113c5ec3d62a8d32430b81fc3bee557513dac05ce6bdb39e6bc3c1a3477573de74610217ea92d373526
-DIST bond_core-1.8.1.tar.gz 32283 BLAKE2B d9d99891507106bff4f4ef7beb80ef878c9ddbbbcb073ea5bbeba11c0d21a7f94dc12a9fc3daea26c4f7585c991bb6283244af8852cee47162185136e0a2d694 SHA512 767d47d7d69bf2a1e6ce5d403f1e0f248c9414998a077f9a0815976975c6ed071eb0338543b9947285b30f5135e410fc273ad4243e5478819286a96e94f4584c
-DIST bond_core-1.8.2.tar.gz 32541 BLAKE2B d2c3000dcd92399f8349f9fbcffbfb432f6f98128365296071ce478c41e9754def757ab26cc89a7e00a0c503ae037792cf494ab53a315fe95de9a56803b2d1ab SHA512 6cb0d5f7af42d1e558772a06ec62a8f31ec8716c72c4d04927301b222de0a67df246e288e777d2ebc9c78000d3bd0c4efe494ea184beb3c906343e83e443c844
-DIST bond_core-1.8.3.tar.gz 32831 BLAKE2B d0c71488436340eff92930006d995ecdd0e98248606b3a6588b36a057584ccc325f751cc170443d21212138bfca2d34c47bd88d4a8a0b719cce81de7bab3218f SHA512 9f9bb71b431199582a36da6ec53806f25fd28fcdfe42e34d60a759f07de98ec86e3f156bc95dc218f3c517e66be426fc30510e111ade9459dfefd74a9555943a
-EBUILD bond-1.7.19.ebuild 489 BLAKE2B f10c4609a94d07b9931f106386cce833450c0feb0511414959fa89d137498dd4fd06b82b66a4e3db9b3cf1298bc17362ff4de0dff76253c53d9a47ccf941cd07 SHA512 1d68b3c1e97eb34c1c2f6c2e7263d07445860bcb3c4d0539e48d24e7651e4cdaa23f1e9eb314cf5c789c91bc754fefcb41d0d27e0d1ab577aae9817d65ff0cbc
-EBUILD bond-1.8.0.ebuild 489 BLAKE2B f10c4609a94d07b9931f106386cce833450c0feb0511414959fa89d137498dd4fd06b82b66a4e3db9b3cf1298bc17362ff4de0dff76253c53d9a47ccf941cd07 SHA512 1d68b3c1e97eb34c1c2f6c2e7263d07445860bcb3c4d0539e48d24e7651e4cdaa23f1e9eb314cf5c789c91bc754fefcb41d0d27e0d1ab577aae9817d65ff0cbc
-EBUILD bond-1.8.1.ebuild 489 BLAKE2B f10c4609a94d07b9931f106386cce833450c0feb0511414959fa89d137498dd4fd06b82b66a4e3db9b3cf1298bc17362ff4de0dff76253c53d9a47ccf941cd07 SHA512 1d68b3c1e97eb34c1c2f6c2e7263d07445860bcb3c4d0539e48d24e7651e4cdaa23f1e9eb314cf5c789c91bc754fefcb41d0d27e0d1ab577aae9817d65ff0cbc
-EBUILD bond-1.8.2.ebuild 489 BLAKE2B f10c4609a94d07b9931f106386cce833450c0feb0511414959fa89d137498dd4fd06b82b66a4e3db9b3cf1298bc17362ff4de0dff76253c53d9a47ccf941cd07 SHA512 1d68b3c1e97eb34c1c2f6c2e7263d07445860bcb3c4d0539e48d24e7651e4cdaa23f1e9eb314cf5c789c91bc754fefcb41d0d27e0d1ab577aae9817d65ff0cbc
-EBUILD bond-1.8.3.ebuild 489 BLAKE2B f10c4609a94d07b9931f106386cce833450c0feb0511414959fa89d137498dd4fd06b82b66a4e3db9b3cf1298bc17362ff4de0dff76253c53d9a47ccf941cd07 SHA512 1d68b3c1e97eb34c1c2f6c2e7263d07445860bcb3c4d0539e48d24e7651e4cdaa23f1e9eb314cf5c789c91bc754fefcb41d0d27e0d1ab577aae9817d65ff0cbc
-EBUILD bond-9999.ebuild 489 BLAKE2B f10c4609a94d07b9931f106386cce833450c0feb0511414959fa89d137498dd4fd06b82b66a4e3db9b3cf1298bc17362ff4de0dff76253c53d9a47ccf941cd07 SHA512 1d68b3c1e97eb34c1c2f6c2e7263d07445860bcb3c4d0539e48d24e7651e4cdaa23f1e9eb314cf5c789c91bc754fefcb41d0d27e0d1ab577aae9817d65ff0cbc
+DIST bond_core-1.8.5.tar.gz 33713 BLAKE2B c18d77ac0d8ccf717dc5eba28ae560d4ce07aa7e4b077be5c38f46bccfe5b9fc218f47b72a553605e6c25d2b79e15decfceab5ce8ad8b211c6b1a91ab05cf7ba SHA512 544c0abc2e77debc984fdf6941b8f44b2a77b37ee50b4fd27418a296e8c489f445285358e32cc723d47a75bf0e289c9d49133a096efdbed26a0a058f3ea06609
+EBUILD bond-1.8.5.ebuild 449 BLAKE2B d3c80d012695869c859fbebe7408949776e4bfd58212db5558e74f7a51babd26d98aaf08a6d3f7eb106001f484a50a1e7772a4320590db3996ec30837678101a SHA512 9ed5d1522408a2ac0d2595931f4a4dee07667bfd637ebfc7c33a61da826ee882ecc2d5d493669780718b52f19004930aac09abb28699c548d3bfbbada65e82f5
+EBUILD bond-9999.ebuild 449 BLAKE2B d3c80d012695869c859fbebe7408949776e4bfd58212db5558e74f7a51babd26d98aaf08a6d3f7eb106001f484a50a1e7772a4320590db3996ec30837678101a SHA512 9ed5d1522408a2ac0d2595931f4a4dee07667bfd637ebfc7c33a61da826ee882ecc2d5d493669780718b52f19004930aac09abb28699c548d3bfbbada65e82f5
MISC metadata.xml 327 BLAKE2B e092eb0166dfaa1b0621bf8b428daa6d4d3ad9c5508865753ac6b8a7154c060d4328b695addd27d82aa2fe6dbfd2c3b9b1bfff3ae8f15d4f4a72e06952b1de15 SHA512 08675ab2448c90d64ccdc426a04ba319caa4be4291b8f5ede6b077ccecbf14aee898975525d12c9d0c97597b4d91be36e9ddfad18c5a5e4b072a58c0833828d3
diff --git a/dev-ros/bond/bond-1.7.19.ebuild b/dev-ros/bond/bond-1.7.19.ebuild
deleted file mode 100644
index 82922d265f43..000000000000
--- a/dev-ros/bond/bond-1.7.19.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="A bond allows two processes, A and B, to know when the other has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bond/bond-1.8.0.ebuild b/dev-ros/bond/bond-1.8.0.ebuild
deleted file mode 100644
index 82922d265f43..000000000000
--- a/dev-ros/bond/bond-1.8.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="A bond allows two processes, A and B, to know when the other has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bond/bond-1.8.1.ebuild b/dev-ros/bond/bond-1.8.1.ebuild
deleted file mode 100644
index 82922d265f43..000000000000
--- a/dev-ros/bond/bond-1.8.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="A bond allows two processes, A and B, to know when the other has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bond/bond-1.8.2.ebuild b/dev-ros/bond/bond-1.8.2.ebuild
deleted file mode 100644
index 82922d265f43..000000000000
--- a/dev-ros/bond/bond-1.8.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="A bond allows two processes, A and B, to know when the other has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bond/bond-1.8.3.ebuild b/dev-ros/bond/bond-1.8.3.ebuild
deleted file mode 100644
index 82922d265f43..000000000000
--- a/dev-ros/bond/bond-1.8.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="A bond allows two processes, A and B, to know when the other has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bond/bond-1.8.5.ebuild b/dev-ros/bond/bond-1.8.5.ebuild
new file mode 100644
index 000000000000..16f4aac71766
--- /dev/null
+++ b/dev-ros/bond/bond-1.8.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/bond_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="A bond allows two processes, A and B, to know when the other has terminated"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/bond/bond-9999.ebuild b/dev-ros/bond/bond-9999.ebuild
index 82922d265f43..16f4aac71766 100644
--- a/dev-ros/bond/bond-9999.ebuild
+++ b/dev-ros/bond/bond-9999.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/bond_core"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
diff --git a/dev-ros/bondcpp/Manifest b/dev-ros/bondcpp/Manifest
index ec67fbb178a8..ee56a0e301cf 100644
--- a/dev-ros/bondcpp/Manifest
+++ b/dev-ros/bondcpp/Manifest
@@ -1,8 +1,4 @@
-DIST bond_core-1.8.1.tar.gz 32283 BLAKE2B d9d99891507106bff4f4ef7beb80ef878c9ddbbbcb073ea5bbeba11c0d21a7f94dc12a9fc3daea26c4f7585c991bb6283244af8852cee47162185136e0a2d694 SHA512 767d47d7d69bf2a1e6ce5d403f1e0f248c9414998a077f9a0815976975c6ed071eb0338543b9947285b30f5135e410fc273ad4243e5478819286a96e94f4584c
-DIST bond_core-1.8.2.tar.gz 32541 BLAKE2B d2c3000dcd92399f8349f9fbcffbfb432f6f98128365296071ce478c41e9754def757ab26cc89a7e00a0c503ae037792cf494ab53a315fe95de9a56803b2d1ab SHA512 6cb0d5f7af42d1e558772a06ec62a8f31ec8716c72c4d04927301b222de0a67df246e288e777d2ebc9c78000d3bd0c4efe494ea184beb3c906343e83e443c844
-DIST bond_core-1.8.3.tar.gz 32831 BLAKE2B d0c71488436340eff92930006d995ecdd0e98248606b3a6588b36a057584ccc325f751cc170443d21212138bfca2d34c47bd88d4a8a0b719cce81de7bab3218f SHA512 9f9bb71b431199582a36da6ec53806f25fd28fcdfe42e34d60a759f07de98ec86e3f156bc95dc218f3c517e66be426fc30510e111ade9459dfefd74a9555943a
-EBUILD bondcpp-1.8.1.ebuild 508 BLAKE2B 80a4608118ea91ecd6905a5df869641fb1fdce1a1188274dc152fe6174c05f663646c06ec27c69989de964aefeaf7f7fdd4a1de26424d9305186da5e4557aeec SHA512 83938bf6269b87f32651e3c095e906d45ac3d42de4d117a4c037af30fc8644ae1439fbb417a4743fedc02e83e04a6b45a1b4a453f247dc7f3a1f08baab2ebe60
-EBUILD bondcpp-1.8.2.ebuild 508 BLAKE2B 80a4608118ea91ecd6905a5df869641fb1fdce1a1188274dc152fe6174c05f663646c06ec27c69989de964aefeaf7f7fdd4a1de26424d9305186da5e4557aeec SHA512 83938bf6269b87f32651e3c095e906d45ac3d42de4d117a4c037af30fc8644ae1439fbb417a4743fedc02e83e04a6b45a1b4a453f247dc7f3a1f08baab2ebe60
-EBUILD bondcpp-1.8.3.ebuild 508 BLAKE2B 80a4608118ea91ecd6905a5df869641fb1fdce1a1188274dc152fe6174c05f663646c06ec27c69989de964aefeaf7f7fdd4a1de26424d9305186da5e4557aeec SHA512 83938bf6269b87f32651e3c095e906d45ac3d42de4d117a4c037af30fc8644ae1439fbb417a4743fedc02e83e04a6b45a1b4a453f247dc7f3a1f08baab2ebe60
-EBUILD bondcpp-9999.ebuild 508 BLAKE2B 80a4608118ea91ecd6905a5df869641fb1fdce1a1188274dc152fe6174c05f663646c06ec27c69989de964aefeaf7f7fdd4a1de26424d9305186da5e4557aeec SHA512 83938bf6269b87f32651e3c095e906d45ac3d42de4d117a4c037af30fc8644ae1439fbb417a4743fedc02e83e04a6b45a1b4a453f247dc7f3a1f08baab2ebe60
+DIST bond_core-1.8.5.tar.gz 33713 BLAKE2B c18d77ac0d8ccf717dc5eba28ae560d4ce07aa7e4b077be5c38f46bccfe5b9fc218f47b72a553605e6c25d2b79e15decfceab5ce8ad8b211c6b1a91ab05cf7ba SHA512 544c0abc2e77debc984fdf6941b8f44b2a77b37ee50b4fd27418a296e8c489f445285358e32cc723d47a75bf0e289c9d49133a096efdbed26a0a058f3ea06609
+EBUILD bondcpp-1.8.5.ebuild 493 BLAKE2B f723924109ba22387ae651b4115c07ddd4591241ae2f846512539754c24947fab4390bb9a269eb4d612725a23d23199b389a98f963a69cc1f129b377788e5e26 SHA512 c6bf1ed01b3e3eae3b078071ad1919013da0ceea4045b8a6cb38f39fc874b060c002bd9bd4d7e56bb74103524362d3d2228a90986757004df12d3d2fcb1b17ce
+EBUILD bondcpp-9999.ebuild 493 BLAKE2B f723924109ba22387ae651b4115c07ddd4591241ae2f846512539754c24947fab4390bb9a269eb4d612725a23d23199b389a98f963a69cc1f129b377788e5e26 SHA512 c6bf1ed01b3e3eae3b078071ad1919013da0ceea4045b8a6cb38f39fc874b060c002bd9bd4d7e56bb74103524362d3d2228a90986757004df12d3d2fcb1b17ce
MISC metadata.xml 327 BLAKE2B e092eb0166dfaa1b0621bf8b428daa6d4d3ad9c5508865753ac6b8a7154c060d4328b695addd27d82aa2fe6dbfd2c3b9b1bfff3ae8f15d4f4a72e06952b1de15 SHA512 08675ab2448c90d64ccdc426a04ba319caa4be4291b8f5ede6b077ccecbf14aee898975525d12c9d0c97597b4d91be36e9ddfad18c5a5e4b072a58c0833828d3
diff --git a/dev-ros/bondcpp/bondcpp-1.8.1.ebuild b/dev-ros/bondcpp/bondcpp-1.8.1.ebuild
deleted file mode 100644
index 5516dd68b9ff..000000000000
--- a/dev-ros/bondcpp/bondcpp-1.8.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bond
- dev-ros/cmake_modules
- >=dev-ros/roscpp-1.13.6
- dev-ros/smclib
- dev-libs/boost:=
- sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondcpp/bondcpp-1.8.2.ebuild b/dev-ros/bondcpp/bondcpp-1.8.2.ebuild
deleted file mode 100644
index 5516dd68b9ff..000000000000
--- a/dev-ros/bondcpp/bondcpp-1.8.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bond
- dev-ros/cmake_modules
- >=dev-ros/roscpp-1.13.6
- dev-ros/smclib
- dev-libs/boost:=
- sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondcpp/bondcpp-1.8.3.ebuild b/dev-ros/bondcpp/bondcpp-1.8.3.ebuild
deleted file mode 100644
index 5516dd68b9ff..000000000000
--- a/dev-ros/bondcpp/bondcpp-1.8.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bond
- dev-ros/cmake_modules
- >=dev-ros/roscpp-1.13.6
- dev-ros/smclib
- dev-libs/boost:=
- sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondcpp/bondcpp-1.8.5.ebuild b/dev-ros/bondcpp/bondcpp-1.8.5.ebuild
new file mode 100644
index 000000000000..dc38b47180d5
--- /dev/null
+++ b/dev-ros/bondcpp/bondcpp-1.8.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/bond_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of bond, for checking when another process has terminated"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/bond
+ dev-ros/cmake_modules
+ >=dev-ros/roscpp-1.13.6
+ dev-ros/smclib
+ dev-libs/boost:=
+ sys-apps/util-linux
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondcpp/bondcpp-9999.ebuild b/dev-ros/bondcpp/bondcpp-9999.ebuild
index 5516dd68b9ff..dc38b47180d5 100644
--- a/dev-ros/bondcpp/bondcpp-9999.ebuild
+++ b/dev-ros/bondcpp/bondcpp-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/bond_core"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="C++ implementation of bond, a mechanism for checking when another process has terminated"
+DESCRIPTION="C++ implementation of bond, for checking when another process has terminated"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/bondpy/Manifest b/dev-ros/bondpy/Manifest
index f63bc9da3b1a..2ed910f0ae92 100644
--- a/dev-ros/bondpy/Manifest
+++ b/dev-ros/bondpy/Manifest
@@ -1,18 +1,4 @@
-DIST bond_core-1.7.16.tar.gz 25327 BLAKE2B 1be27c56d656b85da87a59451df82355d80178efbb5a201d9891d59491f6cdf13147ba88a2a1ee8071b167f3f0b60e2e7f93d767bbc53bfa36af712a75d0b751 SHA512 1c35776782edfb7397845fde0ef3fcaac6179f1c55637fd5209303feb1755f13bff85e6cf36a2dd2671c18d5b433cb8e9ede04df923f742e22934b19d044e06e
-DIST bond_core-1.7.17.tar.gz 31334 BLAKE2B 1b807b321231647d6d88de17bd76e00121a18749b52ccd091902761c792453be85aa342231fb7e25a8a5ff9ea23530449bc58a20c6d2522d7afe231a94b5e994 SHA512 248146e6704c36f014e0f4c5178e566b6c4e344f46b39d4ac9a6cf6b152d1c163b5881921168b8898ec44da9d9b5bc69dc3a66ae26be61007c109aed1990ee73
-DIST bond_core-1.7.18.tar.gz 31402 BLAKE2B 7c87354c1e92f5be29e751029d229859658d1841830b0d66d3a635f7073e7da86e26554e99d3d2dc00ea5586313350d0c094114ca2fab492aae7e4844e2bbbfd SHA512 d943ea3ad4de6cbf8f703161a511d235229369ec593ff6532180cf7a0114ba51d20b736491d4c4415b642c1994901ba51983580cd02aa69d64c4e0a318e00a75
-DIST bond_core-1.7.19.tar.gz 31455 BLAKE2B 86b21d44624c0be8c9445b53d46541785d47fe36366e1d25305a689faa99577905730cd313b7789302ebc6677f85c361d8c51a523233ade11bd6b493ee986dd2 SHA512 63584fa465dba48def1c049e713b0438ea6dd15bd968ee5a1ef969e21540d2693eb61bffb40134dd28486c83c6e54d8db9c71af8f2949bd38a3f7c63be5b65fb
-DIST bond_core-1.8.0.tar.gz 32199 BLAKE2B 8b5f308c3ff4ee3cf4d969ffa7cc05433ab0b992865a782b9c63d8b27615a158fe1885302703aa357f486ea4409e9e07aa3b43bbef6d41fbd127a8bc2c7252cc SHA512 5519d5366d94403862f34ff16e06ead099a164e43987a113c5ec3d62a8d32430b81fc3bee557513dac05ce6bdb39e6bc3c1a3477573de74610217ea92d373526
-DIST bond_core-1.8.1.tar.gz 32283 BLAKE2B d9d99891507106bff4f4ef7beb80ef878c9ddbbbcb073ea5bbeba11c0d21a7f94dc12a9fc3daea26c4f7585c991bb6283244af8852cee47162185136e0a2d694 SHA512 767d47d7d69bf2a1e6ce5d403f1e0f248c9414998a077f9a0815976975c6ed071eb0338543b9947285b30f5135e410fc273ad4243e5478819286a96e94f4584c
-DIST bond_core-1.8.2.tar.gz 32541 BLAKE2B d2c3000dcd92399f8349f9fbcffbfb432f6f98128365296071ce478c41e9754def757ab26cc89a7e00a0c503ae037792cf494ab53a315fe95de9a56803b2d1ab SHA512 6cb0d5f7af42d1e558772a06ec62a8f31ec8716c72c4d04927301b222de0a67df246e288e777d2ebc9c78000d3bd0c4efe494ea184beb3c906343e83e443c844
-DIST bond_core-1.8.3.tar.gz 32831 BLAKE2B d0c71488436340eff92930006d995ecdd0e98248606b3a6588b36a057584ccc325f751cc170443d21212138bfca2d34c47bd88d4a8a0b719cce81de7bab3218f SHA512 9f9bb71b431199582a36da6ec53806f25fd28fcdfe42e34d60a759f07de98ec86e3f156bc95dc218f3c517e66be426fc30510e111ade9459dfefd74a9555943a
-EBUILD bondpy-1.7.16.ebuild 524 BLAKE2B 9f75cc74635cfbc54835c7904299ced1d063ebcd3f9635c61732464da7985451621e464bf0b37ca6380094a265c69a4b7513a5305a5e91809302430aa98df8f6 SHA512 5b04401038e8e45910ec8b94da0894eceed3c54b1021d39b3891239a5b801a956a4b8cc65315083cf44aee5d5998b77c6582861d224a27f6c8fa4b33556d3f5a
-EBUILD bondpy-1.7.17.ebuild 524 BLAKE2B 9f75cc74635cfbc54835c7904299ced1d063ebcd3f9635c61732464da7985451621e464bf0b37ca6380094a265c69a4b7513a5305a5e91809302430aa98df8f6 SHA512 5b04401038e8e45910ec8b94da0894eceed3c54b1021d39b3891239a5b801a956a4b8cc65315083cf44aee5d5998b77c6582861d224a27f6c8fa4b33556d3f5a
-EBUILD bondpy-1.7.18.ebuild 524 BLAKE2B a8c12d70118fb84cffc0babf118a487c1dd7b7474afeae735f0802a3c1f49ff0a9d3f46330dc6679a8a47303bb14e5d07842ab5da27c471f6abf622bd935998c SHA512 cc39348c27be295af7ea3d946f85278b2f4804769d6ca2bff9d7751802f44187d024311db6a38060135378ef575617000404911fafa70d464fb0c09a36240d17
-EBUILD bondpy-1.7.19.ebuild 524 BLAKE2B 4baf66fb09172fa53aa92f0490458d68bcadd5f801e7fa944281af24c6eb492685e2d2a75e97b6549b1e8e7133cef549dc680636431c2b34f845dbafc42101d7 SHA512 5080f86ba24532071160bb1f8705f0d131eb9f77cee14bb7a4ba74fe359192a4cc3042ede6184b2fd71cfe976bf25d56c5e775a34fa7356a2e06b33cf1a0df43
-EBUILD bondpy-1.8.0.ebuild 524 BLAKE2B 4baf66fb09172fa53aa92f0490458d68bcadd5f801e7fa944281af24c6eb492685e2d2a75e97b6549b1e8e7133cef549dc680636431c2b34f845dbafc42101d7 SHA512 5080f86ba24532071160bb1f8705f0d131eb9f77cee14bb7a4ba74fe359192a4cc3042ede6184b2fd71cfe976bf25d56c5e775a34fa7356a2e06b33cf1a0df43
-EBUILD bondpy-1.8.1.ebuild 524 BLAKE2B 4baf66fb09172fa53aa92f0490458d68bcadd5f801e7fa944281af24c6eb492685e2d2a75e97b6549b1e8e7133cef549dc680636431c2b34f845dbafc42101d7 SHA512 5080f86ba24532071160bb1f8705f0d131eb9f77cee14bb7a4ba74fe359192a4cc3042ede6184b2fd71cfe976bf25d56c5e775a34fa7356a2e06b33cf1a0df43
-EBUILD bondpy-1.8.2.ebuild 524 BLAKE2B 61386d97f5a62bce5c46d38b89324e7196e97260fa255894516f4043283b279df186a3d3b2778a09b477e48cfaa763ad877bdd57c9e41c249e00e9ceb4f77e47 SHA512 c115d9fb24d0b690c910a32e3643f402a587b4d57d0af73e75c5420e03df456f33918c965e6cf6efa6c8927990b05e745f76cae69b089d605d554267a3add93d
-EBUILD bondpy-1.8.3.ebuild 524 BLAKE2B 61386d97f5a62bce5c46d38b89324e7196e97260fa255894516f4043283b279df186a3d3b2778a09b477e48cfaa763ad877bdd57c9e41c249e00e9ceb4f77e47 SHA512 c115d9fb24d0b690c910a32e3643f402a587b4d57d0af73e75c5420e03df456f33918c965e6cf6efa6c8927990b05e745f76cae69b089d605d554267a3add93d
-EBUILD bondpy-9999.ebuild 524 BLAKE2B 9f75cc74635cfbc54835c7904299ced1d063ebcd3f9635c61732464da7985451621e464bf0b37ca6380094a265c69a4b7513a5305a5e91809302430aa98df8f6 SHA512 5b04401038e8e45910ec8b94da0894eceed3c54b1021d39b3891239a5b801a956a4b8cc65315083cf44aee5d5998b77c6582861d224a27f6c8fa4b33556d3f5a
+DIST bond_core-1.8.5.tar.gz 33713 BLAKE2B c18d77ac0d8ccf717dc5eba28ae560d4ce07aa7e4b077be5c38f46bccfe5b9fc218f47b72a553605e6c25d2b79e15decfceab5ce8ad8b211c6b1a91ab05cf7ba SHA512 544c0abc2e77debc984fdf6941b8f44b2a77b37ee50b4fd27418a296e8c489f445285358e32cc723d47a75bf0e289c9d49133a096efdbed26a0a058f3ea06609
+EBUILD bondpy-1.8.5.ebuild 481 BLAKE2B 25519eaf8576acebd058fa15b5e3aa4a1070db1e6c6f413a7b6afdc90bb8407589ece09b637a3523b8178c3823b2aa960d3245c14553fba6fa38a569ba693114 SHA512 f10a5c88442beddb4927a2d126c26d2942bd426b87f9fbe5644467cb8fbc68d5dd6fb5677911042c10e594976890d8b05027474dbf20640238977e7addeb9fae
+EBUILD bondpy-9999.ebuild 481 BLAKE2B 25519eaf8576acebd058fa15b5e3aa4a1070db1e6c6f413a7b6afdc90bb8407589ece09b637a3523b8178c3823b2aa960d3245c14553fba6fa38a569ba693114 SHA512 f10a5c88442beddb4927a2d126c26d2942bd426b87f9fbe5644467cb8fbc68d5dd6fb5677911042c10e594976890d8b05027474dbf20640238977e7addeb9fae
MISC metadata.xml 327 BLAKE2B e092eb0166dfaa1b0621bf8b428daa6d4d3ad9c5508865753ac6b8a7154c060d4328b695addd27d82aa2fe6dbfd2c3b9b1bfff3ae8f15d4f4a72e06952b1de15 SHA512 08675ab2448c90d64ccdc426a04ba319caa4be4291b8f5ede6b077ccecbf14aee898975525d12c9d0c97597b4d91be36e9ddfad18c5a5e4b072a58c0833828d3
diff --git a/dev-ros/bondpy/bondpy-1.7.16.ebuild b/dev-ros/bondpy/bondpy-1.7.16.ebuild
deleted file mode 100644
index f686d8463127..000000000000
--- a/dev-ros/bondpy/bondpy-1.7.16.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bond[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/smclib
- sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.7.17.ebuild b/dev-ros/bondpy/bondpy-1.7.17.ebuild
deleted file mode 100644
index f686d8463127..000000000000
--- a/dev-ros/bondpy/bondpy-1.7.17.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bond[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/smclib
- sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.7.18.ebuild b/dev-ros/bondpy/bondpy-1.7.18.ebuild
deleted file mode 100644
index 0f6b315b2ff6..000000000000
--- a/dev-ros/bondpy/bondpy-1.7.18.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bond[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/smclib
- sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.7.19.ebuild b/dev-ros/bondpy/bondpy-1.7.19.ebuild
deleted file mode 100644
index 1944a1c798b6..000000000000
--- a/dev-ros/bondpy/bondpy-1.7.19.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bond[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/smclib
- sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.8.0.ebuild b/dev-ros/bondpy/bondpy-1.8.0.ebuild
deleted file mode 100644
index 1944a1c798b6..000000000000
--- a/dev-ros/bondpy/bondpy-1.8.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bond[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/smclib
- sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.8.1.ebuild b/dev-ros/bondpy/bondpy-1.8.1.ebuild
deleted file mode 100644
index 1944a1c798b6..000000000000
--- a/dev-ros/bondpy/bondpy-1.8.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bond[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/smclib
- sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.8.2.ebuild b/dev-ros/bondpy/bondpy-1.8.2.ebuild
deleted file mode 100644
index 4440f46b7719..000000000000
--- a/dev-ros/bondpy/bondpy-1.8.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bond[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/smclib
- sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.8.3.ebuild b/dev-ros/bondpy/bondpy-1.8.3.ebuild
deleted file mode 100644
index 4440f46b7719..000000000000
--- a/dev-ros/bondpy/bondpy-1.8.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bond[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/smclib
- sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.8.5.ebuild b/dev-ros/bondpy/bondpy-1.8.5.ebuild
new file mode 100644
index 000000000000..88c390a005ec
--- /dev/null
+++ b/dev-ros/bondpy/bondpy-1.8.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/bond_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python implementation of bond, for checking when another process has terminated"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/bond[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/smclib
+ sys-apps/util-linux
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-9999.ebuild b/dev-ros/bondpy/bondpy-9999.ebuild
index f686d8463127..88c390a005ec 100644
--- a/dev-ros/bondpy/bondpy-9999.ebuild
+++ b/dev-ros/bondpy/bondpy-9999.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/bond_core"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
+DESCRIPTION="Python implementation of bond, for checking when another process has terminated"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/calibration_estimation/Manifest b/dev-ros/calibration_estimation/Manifest
index d37ab1fc427e..61fb866a333b 100644
--- a/dev-ros/calibration_estimation/Manifest
+++ b/dev-ros/calibration_estimation/Manifest
@@ -1,6 +1,4 @@
-DIST calibration-0.10.13.tar.gz 112305 BLAKE2B 1b2c2ffa0c07b907c7a4dc28b87ff112a497275039be98bcc15ad396ccf525ba4fb717b398551f04dab7131a8085e1b1ec64eb24408c12fec09e9c42b5c40a75 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb
DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD calibration_estimation-0.10.13.ebuild 894 BLAKE2B 5ce9e71bfe04e4ddf1543698bb03f2e3a172e7d8cfd27a2ad71c77f31b233f1e6e94ae5823ec0f230a80c2fe37488fdd1ace2d7ca4bd8504267a8802a646219b SHA512 44640c1e0eef9d9b90e601e343dd84cc82af314cfc5399173b35f4abd66d889cafa7a09ce16a59c9e8d34a323e00205b587e621fcac3ce51dde55fe054acf491
-EBUILD calibration_estimation-0.10.14.ebuild 894 BLAKE2B 5ce9e71bfe04e4ddf1543698bb03f2e3a172e7d8cfd27a2ad71c77f31b233f1e6e94ae5823ec0f230a80c2fe37488fdd1ace2d7ca4bd8504267a8802a646219b SHA512 44640c1e0eef9d9b90e601e343dd84cc82af314cfc5399173b35f4abd66d889cafa7a09ce16a59c9e8d34a323e00205b587e621fcac3ce51dde55fe054acf491
-EBUILD calibration_estimation-9999.ebuild 894 BLAKE2B 5ce9e71bfe04e4ddf1543698bb03f2e3a172e7d8cfd27a2ad71c77f31b233f1e6e94ae5823ec0f230a80c2fe37488fdd1ace2d7ca4bd8504267a8802a646219b SHA512 44640c1e0eef9d9b90e601e343dd84cc82af314cfc5399173b35f4abd66d889cafa7a09ce16a59c9e8d34a323e00205b587e621fcac3ce51dde55fe054acf491
+EBUILD calibration_estimation-0.10.14.ebuild 863 BLAKE2B b9f07c8915c5beef56595f8001417e7b60e0902660110ffc27d78b0f17ba942181f4e5e9f28979316be75bb39ebf706a732ae37f809781af219faf89dc8891b6 SHA512 dafeae7607b7e05c5081ea147200a30da878eacfc09bd5bb3152becd5857481fbe7789553a9dbdaf06584e55e6ad9555a1b9db4462834ed95f329d935e68d087
+EBUILD calibration_estimation-9999.ebuild 863 BLAKE2B b9f07c8915c5beef56595f8001417e7b60e0902660110ffc27d78b0f17ba942181f4e5e9f28979316be75bb39ebf706a732ae37f809781af219faf89dc8891b6 SHA512 dafeae7607b7e05c5081ea147200a30da878eacfc09bd5bb3152becd5857481fbe7789553a9dbdaf06584e55e6ad9555a1b9db4462834ed95f329d935e68d087
MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/calibration_estimation/calibration_estimation-0.10.13.ebuild b/dev-ros/calibration_estimation/calibration_estimation-0.10.13.ebuild
deleted file mode 100644
index bbce471d0c6c..000000000000
--- a/dev-ros/calibration_estimation/calibration_estimation-0.10.13.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Runs an optimization to estimate the a robot's kinematic parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/calibration_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- dev-python/urdf_parser_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild b/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild
index bbce471d0c6c..95df5b77cf91 100644
--- a/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild
+++ b/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
diff --git a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
index bbce471d0c6c..95df5b77cf91 100644
--- a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
+++ b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
diff --git a/dev-ros/calibration_launch/Manifest b/dev-ros/calibration_launch/Manifest
index 84380a35face..a366ca68a574 100644
--- a/dev-ros/calibration_launch/Manifest
+++ b/dev-ros/calibration_launch/Manifest
@@ -1,6 +1,4 @@
-DIST calibration-0.10.13.tar.gz 112305 BLAKE2B 1b2c2ffa0c07b907c7a4dc28b87ff112a497275039be98bcc15ad396ccf525ba4fb717b398551f04dab7131a8085e1b1ec64eb24408c12fec09e9c42b5c40a75 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb
DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD calibration_launch-0.10.13.ebuild 546 BLAKE2B e36018028e59c08a3ab8c025fb3b226ea17fa074968b0fd054425dd9ecbc5bf583d6e454bb6e448e5fe38657e733984f30e8d07ed8279b8a5c3fd358e57f8989 SHA512 18b7f9f68d3382d5e55cefcde9ddfc709881fe54c3af42345b69c69202fb1b13f86e168ba65c8fc009ac388da14ba2663cfcce26ef79f85044e8b154c2176bdd
-EBUILD calibration_launch-0.10.14.ebuild 546 BLAKE2B e36018028e59c08a3ab8c025fb3b226ea17fa074968b0fd054425dd9ecbc5bf583d6e454bb6e448e5fe38657e733984f30e8d07ed8279b8a5c3fd358e57f8989 SHA512 18b7f9f68d3382d5e55cefcde9ddfc709881fe54c3af42345b69c69202fb1b13f86e168ba65c8fc009ac388da14ba2663cfcce26ef79f85044e8b154c2176bdd
-EBUILD calibration_launch-9999.ebuild 546 BLAKE2B e36018028e59c08a3ab8c025fb3b226ea17fa074968b0fd054425dd9ecbc5bf583d6e454bb6e448e5fe38657e733984f30e8d07ed8279b8a5c3fd358e57f8989 SHA512 18b7f9f68d3382d5e55cefcde9ddfc709881fe54c3af42345b69c69202fb1b13f86e168ba65c8fc009ac388da14ba2663cfcce26ef79f85044e8b154c2176bdd
+EBUILD calibration_launch-0.10.14.ebuild 524 BLAKE2B aed2d59c7dd17a1fa59b3e85482c561ccd420eb4a5c4b251a9533befeb3cfb45892107b4c4f16b8bd96c52da516c26e51644e5f491d9cbc9523646d4895d3b12 SHA512 b4867dba2dbc1d9b66a4a6c3f9ad5ce64ff2e81b35988c8fe2b01718ee534c96d80c1325c2eceab3dda7e66f13defe2d62947e9564fff1be8908ff335c356daa
+EBUILD calibration_launch-9999.ebuild 524 BLAKE2B aed2d59c7dd17a1fa59b3e85482c561ccd420eb4a5c4b251a9533befeb3cfb45892107b4c4f16b8bd96c52da516c26e51644e5f491d9cbc9523646d4895d3b12 SHA512 b4867dba2dbc1d9b66a4a6c3f9ad5ce64ff2e81b35988c8fe2b01718ee534c96d80c1325c2eceab3dda7e66f13defe2d62947e9564fff1be8908ff335c356daa
MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/calibration_launch/calibration_launch-0.10.13.ebuild b/dev-ros/calibration_launch/calibration_launch-0.10.13.ebuild
deleted file mode 100644
index af3023c2b45d..000000000000
--- a/dev-ros/calibration_launch/calibration_launch-0.10.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files that can be helpful in configuring the calibration stack to run on your robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
- dev-ros/interval_intersection
- dev-ros/joint_states_settler
- dev-ros/laser_cb_detector
- dev-ros/monocam_settler
- dev-ros/roslaunch
- dev-libs/urdfdom
-"
diff --git a/dev-ros/calibration_launch/calibration_launch-0.10.14.ebuild b/dev-ros/calibration_launch/calibration_launch-0.10.14.ebuild
index af3023c2b45d..b3b796757277 100644
--- a/dev-ros/calibration_launch/calibration_launch-0.10.14.ebuild
+++ b/dev-ros/calibration_launch/calibration_launch-0.10.14.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="Launch files that can be helpful in configuring the calibration stack to run on your robot"
+DESCRIPTION="Launch files for configuring the calibration stack to run on your robot"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/calibration_launch/calibration_launch-9999.ebuild b/dev-ros/calibration_launch/calibration_launch-9999.ebuild
index af3023c2b45d..b3b796757277 100644
--- a/dev-ros/calibration_launch/calibration_launch-9999.ebuild
+++ b/dev-ros/calibration_launch/calibration_launch-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="Launch files that can be helpful in configuring the calibration stack to run on your robot"
+DESCRIPTION="Launch files for configuring the calibration stack to run on your robot"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/calibration_msgs/Manifest b/dev-ros/calibration_msgs/Manifest
index 6379b5428fc2..ba9ef872ad78 100644
--- a/dev-ros/calibration_msgs/Manifest
+++ b/dev-ros/calibration_msgs/Manifest
@@ -1,4 +1,4 @@
DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD calibration_msgs-0.10.14.ebuild 557 BLAKE2B 2f13084bc1829032643eee0d6f13aa18d7fb06d2b22c733912f69d91c84d5b3f6c831a86f1b4253a58ce187d24e27aeae57dd791f9c519bc1ddfbafb52185382 SHA512 95da344a579e04d1c11e1b69a25deabe2db966bdbb9783b087538ddcd1014fb82d6e62b3b4a19ce3866d664dc0274b4b5d3ce974ca3c92b967f3272be1073da9
-EBUILD calibration_msgs-9999.ebuild 557 BLAKE2B 2f13084bc1829032643eee0d6f13aa18d7fb06d2b22c733912f69d91c84d5b3f6c831a86f1b4253a58ce187d24e27aeae57dd791f9c519bc1ddfbafb52185382 SHA512 95da344a579e04d1c11e1b69a25deabe2db966bdbb9783b087538ddcd1014fb82d6e62b3b4a19ce3866d664dc0274b4b5d3ce974ca3c92b967f3272be1073da9
+EBUILD calibration_msgs-0.10.14.ebuild 546 BLAKE2B 506dd8293b85be3cfec76a01e19c609f26a331164828ddb66462d1fb88f65c9d3255a9a80f20f0db203de6968c69af9bd3a179e55415611544ecad8195a5a716 SHA512 557d041f7e7bba4b22e817fd90532c143fdbf8f9b1d4eb041d2e36d9f5d37b61cd7b73658a7a18f50e7d10a41b76a94ca71f2d0d35a6ad1fbf063176b7c21f9c
+EBUILD calibration_msgs-9999.ebuild 546 BLAKE2B 506dd8293b85be3cfec76a01e19c609f26a331164828ddb66462d1fb88f65c9d3255a9a80f20f0db203de6968c69af9bd3a179e55415611544ecad8195a5a716 SHA512 557d041f7e7bba4b22e817fd90532c143fdbf8f9b1d4eb041d2e36d9f5d37b61cd7b73658a7a18f50e7d10a41b76a94ca71f2d0d35a6ad1fbf063176b7c21f9c
MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/calibration_msgs/calibration_msgs-0.10.14.ebuild b/dev-ros/calibration_msgs/calibration_msgs-0.10.14.ebuild
index f4f4afa47c8a..58baff7c19e7 100644
--- a/dev-ros/calibration_msgs/calibration_msgs-0.10.14.ebuild
+++ b/dev-ros/calibration_msgs/calibration_msgs-0.10.14.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
@@ -11,7 +11,7 @@ CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-r
inherit ros-catkin
-DESCRIPTION="Messages for storing calibration samples to be used in full robot calibration procedures"
+DESCRIPTION="Messages for storing calibration samples to be used in calibration procedures"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild b/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild
index f4f4afa47c8a..58baff7c19e7 100644
--- a/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild
+++ b/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
@@ -11,7 +11,7 @@ CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-r
inherit ros-catkin
-DESCRIPTION="Messages for storing calibration samples to be used in full robot calibration procedures"
+DESCRIPTION="Messages for storing calibration samples to be used in calibration procedures"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/calibration_setup_helper/Manifest b/dev-ros/calibration_setup_helper/Manifest
index 657d026607d7..260e29b51570 100644
--- a/dev-ros/calibration_setup_helper/Manifest
+++ b/dev-ros/calibration_setup_helper/Manifest
@@ -1,6 +1,4 @@
-DIST calibration-0.10.13.tar.gz 112305 BLAKE2B 1b2c2ffa0c07b907c7a4dc28b87ff112a497275039be98bcc15ad396ccf525ba4fb717b398551f04dab7131a8085e1b1ec64eb24408c12fec09e9c42b5c40a75 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb
DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD calibration_setup_helper-0.10.13.ebuild 434 BLAKE2B e7e8084ed5d221d59850d663d5c1ede8f3ecc9970a7efe2e05113893125768d3f885c3c0e11f9283ef0ca71c6338685a07dd8de65071e539a801e9c142827edf SHA512 2d74b50c5730850fcc758e8ce2949c4092cb77520fa03c27cad5d664a09ef4d3ad88c984b4bba48bd946b2d91f5b3332e99aced0b81b8aeb64b5875905bc94bd
-EBUILD calibration_setup_helper-0.10.14.ebuild 434 BLAKE2B e7e8084ed5d221d59850d663d5c1ede8f3ecc9970a7efe2e05113893125768d3f885c3c0e11f9283ef0ca71c6338685a07dd8de65071e539a801e9c142827edf SHA512 2d74b50c5730850fcc758e8ce2949c4092cb77520fa03c27cad5d664a09ef4d3ad88c984b4bba48bd946b2d91f5b3332e99aced0b81b8aeb64b5875905bc94bd
-EBUILD calibration_setup_helper-9999.ebuild 434 BLAKE2B e7e8084ed5d221d59850d663d5c1ede8f3ecc9970a7efe2e05113893125768d3f885c3c0e11f9283ef0ca71c6338685a07dd8de65071e539a801e9c142827edf SHA512 2d74b50c5730850fcc758e8ce2949c4092cb77520fa03c27cad5d664a09ef4d3ad88c984b4bba48bd946b2d91f5b3332e99aced0b81b8aeb64b5875905bc94bd
+EBUILD calibration_setup_helper-0.10.14.ebuild 403 BLAKE2B 55191eb5632c1dae29ec4af2bd744b6ede7a57252757e93669a209a05cf023ede8e57f9313e4cff53d4709219dc154ba40387c4bca207f033a3d8b5e8cba0888 SHA512 36feae4bb388f2789c49831bb60ea4ee048c3a067f93e2f1692e27d73e529e34a5a4e51ab065a3897dff2a4114cea0bd0a89859f914d154c0ae43dcaf6ea51ab
+EBUILD calibration_setup_helper-9999.ebuild 403 BLAKE2B 55191eb5632c1dae29ec4af2bd744b6ede7a57252757e93669a209a05cf023ede8e57f9313e4cff53d4709219dc154ba40387c4bca207f033a3d8b5e8cba0888 SHA512 36feae4bb388f2789c49831bb60ea4ee048c3a067f93e2f1692e27d73e529e34a5a4e51ab065a3897dff2a4114cea0bd0a89859f914d154c0ae43dcaf6ea51ab
MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.13.ebuild b/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.13.ebuild
deleted file mode 100644
index bb46fd420687..000000000000
--- a/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.13.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Script to generate calibration launch and configurationfiles for your robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-ros/calibration_launch"
diff --git a/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.14.ebuild b/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.14.ebuild
index bb46fd420687..58b1a15eaf9d 100644
--- a/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.14.ebuild
+++ b/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.14.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
diff --git a/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild b/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild
index bb46fd420687..58b1a15eaf9d 100644
--- a/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild
+++ b/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
diff --git a/dev-ros/camera_calibration/Manifest b/dev-ros/camera_calibration/Manifest
index 7cf1c5d6fed8..f44363e81c8b 100644
--- a/dev-ros/camera_calibration/Manifest
+++ b/dev-ros/camera_calibration/Manifest
@@ -1,22 +1,4 @@
-DIST image_pipeline-1.12.14.tar.gz 118296 BLAKE2B c9893473725d7c736888d3ce24b83a17afa9208afc325f9dcb6b24d464c26a8fdd88db8fd2e43c2251365366f321fe50d1e6f7bb62ca235e0c2f36f81dae605f SHA512 724b6d20edab1436c51a05f4399b852cabab74c5e04dea97f53a256fb512b4dbfc97fd6e7d74d41bfd7d92fe183aa86a993a39b8687c27dc7b7f85d1a1c81b94
-DIST image_pipeline-1.12.15.tar.gz 122012 BLAKE2B ba3595970b479e7708c533840c9cc24e9a793e8cc89ecee656028416dbff58487c5df994ab521852a6658dc01b7d70006f86f493b02c87a058cae1dd21f90a38 SHA512 184805f99020332ad74899ec47abc56144aceef8d4eabf877a4dc85f30befdc78b209407e1be624ba151be3a71be1fafdbd87c771137bee7c080c24935f6c6fa
-DIST image_pipeline-1.12.16.tar.gz 126407 BLAKE2B 7c05810453acd6e8a095a3d49763f315b674753db4e9e7c6714b5bd92f5bd1f01a3f4a257db0432daca347a9d531a797548f498dfbc132b5ad96d2e2e959a089 SHA512 2e1b77a6267fef2925396b36c8d3fdabcf8c0e61043bbeb066f0923bba867c3f63a9da4a9829d26c502af70ad7ab3dcda6cca14628accc472010af8df4b1153e
-DIST image_pipeline-1.12.18.tar.gz 127899 BLAKE2B 4ec0625c57da5348c9b276a8a457f60cecbf58774ba6ec7c51098837259ab0bc241815e313c458d93fa14a71b23b8768a9b4b12966f73893c88783f313e5e07e SHA512 9a9d671d31d3c6a9343836fa8c7a5566fb9e032330dbc57adeab35510263aca0482a8a8413716e79c49e2e187c3892ab200c92435e8797d4b69e3332771b64da
-DIST image_pipeline-1.12.19.tar.gz 130635 BLAKE2B 23709220248c86900c092a94a688cb428ceb58aba621e078cece903038345339e75706b0496aacd616e8a5e67522fff781d6a48022f8e6c231bb76eed9417b6e SHA512 f0677e4a811622ffc19792af828f4766408b6a051d271950a8a096d064b043dae1457b2a6f2d59fe5c2971795db04e7abf5e0878ead1428a4da19033693829ba
-DIST image_pipeline-1.12.20.tar.gz 137888 BLAKE2B 2fa362acf59e545c794136262bab98bd5bf5c9025306df5b3f46fd4f498a13c99ef902653f8725564e02f6d1178ba7b77f973d248e4229c80251ad8f5747fb56 SHA512 37a45cfcc8bdb8b40477860e29f72671d423d4531156f5901128c32a6c41d27f235cdac216502d614ab7ddab5e66c2f343baaa0fd22cf83cb38e667fbbc111c5
-DIST image_pipeline-1.12.21.tar.gz 139264 BLAKE2B 0b60057d35a250b0f4938ad79d893b922501d9416a6a7122c49023f632affd06c1c82bfddff0f10bbebe683d8dd50eb4d947d5086a8bb6935da98f8a2d146eed SHA512 76f06e7a1effb3098454496e01a8c14b34a37a3ea96ac51a0deb860b6891b37d354dcf7d9c06389476decaa90c3097c4495e34d04f70ad6a571fc5469eda2f6c
-DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
-DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
-EBUILD camera_calibration-1.12.14.ebuild 828 BLAKE2B da8e389262e1fcca3a2e796f1009282669fe779c358bfbbfbffbc737a9e302f7d94f17490ef0c03c3b646e77cc6be2c79d5456728f02002a7a1d370f72b6a37c SHA512 9843de38821e963ed06637472329e1933b8b788e3ba1745507ebe9f51199640e5b0a31806eb0b23ed5da60215f499a0094c2726cd7faf2504fdbc71a31eafab1
-EBUILD camera_calibration-1.12.15.ebuild 828 BLAKE2B da8e389262e1fcca3a2e796f1009282669fe779c358bfbbfbffbc737a9e302f7d94f17490ef0c03c3b646e77cc6be2c79d5456728f02002a7a1d370f72b6a37c SHA512 9843de38821e963ed06637472329e1933b8b788e3ba1745507ebe9f51199640e5b0a31806eb0b23ed5da60215f499a0094c2726cd7faf2504fdbc71a31eafab1
-EBUILD camera_calibration-1.12.16.ebuild 828 BLAKE2B da8e389262e1fcca3a2e796f1009282669fe779c358bfbbfbffbc737a9e302f7d94f17490ef0c03c3b646e77cc6be2c79d5456728f02002a7a1d370f72b6a37c SHA512 9843de38821e963ed06637472329e1933b8b788e3ba1745507ebe9f51199640e5b0a31806eb0b23ed5da60215f499a0094c2726cd7faf2504fdbc71a31eafab1
-EBUILD camera_calibration-1.12.18.ebuild 828 BLAKE2B a6833c11c8dc7e6f45dae25ee287fb14393bc9ae8320a930aff053481f753ac9a36331ae65ce667a66e10145504370e374109767fd2e89f30e824e834c59b5bd SHA512 4902c3e58986332f4358f3d8d2f95ece4da4ec424eb7902e989bd7284228afe182c78641859db0bc5910002b53bd32297221233562b6aae102d880a45a8b88cb
-EBUILD camera_calibration-1.12.19.ebuild 828 BLAKE2B a6833c11c8dc7e6f45dae25ee287fb14393bc9ae8320a930aff053481f753ac9a36331ae65ce667a66e10145504370e374109767fd2e89f30e824e834c59b5bd SHA512 4902c3e58986332f4358f3d8d2f95ece4da4ec424eb7902e989bd7284228afe182c78641859db0bc5910002b53bd32297221233562b6aae102d880a45a8b88cb
-EBUILD camera_calibration-1.12.20.ebuild 828 BLAKE2B 9d5455d906f5caaf6cf1a4748171dec9bb6d8cc67d39d5aa59f153673a7659e071fcb2f34b8663ff90d0bed4c037dfc291953f8d9b39cebdd91d1e4ac0938d97 SHA512 3d225fc8d2e0541d0779203bc17d91700a5d2f385f3fcd7cff4444e14a3a7895a892b17ba5cd77c4e6a59bed34419da68a87b193dc536eb0154fedc5c066c843
-EBUILD camera_calibration-1.12.21.ebuild 828 BLAKE2B 9d5455d906f5caaf6cf1a4748171dec9bb6d8cc67d39d5aa59f153673a7659e071fcb2f34b8663ff90d0bed4c037dfc291953f8d9b39cebdd91d1e4ac0938d97 SHA512 3d225fc8d2e0541d0779203bc17d91700a5d2f385f3fcd7cff4444e14a3a7895a892b17ba5cd77c4e6a59bed34419da68a87b193dc536eb0154fedc5c066c843
-EBUILD camera_calibration-1.12.22.ebuild 828 BLAKE2B 9d5455d906f5caaf6cf1a4748171dec9bb6d8cc67d39d5aa59f153673a7659e071fcb2f34b8663ff90d0bed4c037dfc291953f8d9b39cebdd91d1e4ac0938d97 SHA512 3d225fc8d2e0541d0779203bc17d91700a5d2f385f3fcd7cff4444e14a3a7895a892b17ba5cd77c4e6a59bed34419da68a87b193dc536eb0154fedc5c066c843
-EBUILD camera_calibration-1.12.23.ebuild 828 BLAKE2B 7584bc3eb7533127f2475f6a42ccde314f51cb64fcf14ca3e2e1e7ef3f8a3e83c606ce8cc00d0e329f359b46b4d5477d2e68f7a43c9b1b9dd61bbe6d3a8c32a7 SHA512 4fac89c8b30f0be4898a996cf1f2bc0af1643e2e2b0a9b3bfb72ddd50e9e235e623f5600a90f321030f75e1707e3fa200899e6e7e50ba5b81f736735f5227e53
-EBUILD camera_calibration-1.13.0.ebuild 825 BLAKE2B a9b21903a35b2eaa4e7a73b59abcfd6a0b59477cad33ff8a637153b9e0295998d1a377e1c5cf4c686a068c8cbdfdad82678f3550402581bacd27d2b816202615 SHA512 580a5ec88c72b7c699f00d9711593f84c7759c90eb58aa0fa85e094e4c9a30e10c02f5c743d6b6525f4648206bcf7a9e5268f1fb085be345f992ed09133ad1cb
-EBUILD camera_calibration-9999.ebuild 828 BLAKE2B da8e389262e1fcca3a2e796f1009282669fe779c358bfbbfbffbc737a9e302f7d94f17490ef0c03c3b646e77cc6be2c79d5456728f02002a7a1d370f72b6a37c SHA512 9843de38821e963ed06637472329e1933b8b788e3ba1745507ebe9f51199640e5b0a31806eb0b23ed5da60215f499a0094c2726cd7faf2504fdbc71a31eafab1
+DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
+EBUILD camera_calibration-1.15.2.ebuild 693 BLAKE2B ad3918a3535ba8a8fbe6ee4edaf811ca8ba7fc36f79ee70274840eb47524f9aa8935f8e910a673713858c4c7f0fb9616128b5edf658ad27ba984de8e8c821fe7 SHA512 505547eff0add22e0cec617dc11f15878a2879646c8a801274a1b1500c899ca9c6e7b3565ad25ea2eedf7706535607f0f1f50f01111cafb2b1f3d35de33e1f3a
+EBUILD camera_calibration-9999.ebuild 693 BLAKE2B ad3918a3535ba8a8fbe6ee4edaf811ca8ba7fc36f79ee70274840eb47524f9aa8935f8e910a673713858c4c7f0fb9616128b5edf658ad27ba984de8e8c821fe7 SHA512 505547eff0add22e0cec617dc11f15878a2879646c8a801274a1b1500c899ca9c6e7b3565ad25ea2eedf7706535607f0f1f50f01111cafb2b1f3d35de33e1f3a
MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild
deleted file mode 100644
index 3007515b82f3..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge[${PYTHON_USEDEP}]
- dev-ros/image_geometry[${PYTHON_USEDEP}]
- || ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
- dev-ros/message_filters[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/std_srvs[${PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.15.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.15.ebuild
deleted file mode 100644
index 3007515b82f3..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.15.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge[${PYTHON_USEDEP}]
- dev-ros/image_geometry[${PYTHON_USEDEP}]
- || ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
- dev-ros/message_filters[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/std_srvs[${PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.16.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.16.ebuild
deleted file mode 100644
index 3007515b82f3..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.16.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge[${PYTHON_USEDEP}]
- dev-ros/image_geometry[${PYTHON_USEDEP}]
- || ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
- dev-ros/message_filters[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/std_srvs[${PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.18.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.18.ebuild
deleted file mode 100644
index 9c21e67f122f..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.18.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge[${PYTHON_USEDEP}]
- dev-ros/image_geometry[${PYTHON_USEDEP}]
- || ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
- dev-ros/message_filters[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/std_srvs[${PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.19.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.19.ebuild
deleted file mode 100644
index 9c21e67f122f..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.19.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge[${PYTHON_USEDEP}]
- dev-ros/image_geometry[${PYTHON_USEDEP}]
- || ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
- dev-ros/message_filters[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/std_srvs[${PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.20.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.20.ebuild
deleted file mode 100644
index f447ac323c69..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.20.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge[${PYTHON_USEDEP}]
- dev-ros/image_geometry[${PYTHON_USEDEP}]
- || ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
- dev-ros/message_filters[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/std_srvs[${PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.21.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.21.ebuild
deleted file mode 100644
index f447ac323c69..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.21.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge[${PYTHON_USEDEP}]
- dev-ros/image_geometry[${PYTHON_USEDEP}]
- || ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
- dev-ros/message_filters[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/std_srvs[${PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.22.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.22.ebuild
deleted file mode 100644
index f447ac323c69..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.22.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge[${PYTHON_USEDEP}]
- dev-ros/image_geometry[${PYTHON_USEDEP}]
- || ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
- dev-ros/message_filters[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/std_srvs[${PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.23.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.23.ebuild
deleted file mode 100644
index c1bc117b7d18..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.23.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge[${PYTHON_USEDEP}]
- dev-ros/image_geometry[${PYTHON_USEDEP}]
- || ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
- dev-ros/message_filters[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/std_srvs[${PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.13.0.ebuild b/dev-ros/camera_calibration/camera_calibration-1.13.0.ebuild
deleted file mode 100644
index dffb8eec336f..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.13.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge[${PYTHON_USEDEP}]
- dev-ros/image_geometry[${PYTHON_USEDEP}]
- || ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
- dev-ros/message_filters[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/std_srvs[${PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.15.2.ebuild b/dev-ros/camera_calibration/camera_calibration-1.15.2.ebuild
new file mode 100644
index 000000000000..bce8f59a82dc
--- /dev/null
+++ b/dev-ros/camera_calibration/camera_calibration-1.15.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Calibration of monocular or stereo cameras"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge[${PYTHON_USEDEP}]
+ dev-ros/image_geometry[${PYTHON_USEDEP}]
+ media-libs/opencv[python,${PYTHON_USEDEP}]
+ dev-ros/message_filters[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/std_srvs[${PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-9999.ebuild b/dev-ros/camera_calibration/camera_calibration-9999.ebuild
index 3007515b82f3..bce8f59a82dc 100644
--- a/dev-ros/camera_calibration/camera_calibration-9999.ebuild
+++ b/dev-ros/camera_calibration/camera_calibration-9999.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
+DESCRIPTION="Calibration of monocular or stereo cameras"
LICENSE="BSD"
SLOT="0"
IUSE=""
@@ -17,7 +16,7 @@ IUSE=""
RDEPEND="
dev-ros/cv_bridge[${PYTHON_USEDEP}]
dev-ros/image_geometry[${PYTHON_USEDEP}]
- || ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
+ media-libs/opencv[python,${PYTHON_USEDEP}]
dev-ros/message_filters[${PYTHON_USEDEP}]
dev-ros/rospy[${PYTHON_USEDEP}]
dev-ros/std_srvs[${PYTHON_USEDEP}]
diff --git a/dev-ros/combined_robot_hw/Manifest b/dev-ros/combined_robot_hw/Manifest
index 85aed79ac623..0e3fc500861a 100644
--- a/dev-ros/combined_robot_hw/Manifest
+++ b/dev-ros/combined_robot_hw/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD combined_robot_hw-0.14.2.ebuild 469 BLAKE2B e80681e6738a357fa581c2fd6e05f1063720760dd72a30353390a283c35b52cc458f77642375ebd5904d6c2e807b9db26d90ecd0e238923fea9153ca66f52d5d SHA512 7310b5b0cd485a9afd95ea427e3bade40e4aedfbbaf2ba1fce36bb36a832b3375a8efb5e49f5b5705a2d6b13e3009c63f3bf240b45a8021ef79552134db3efa0
-EBUILD combined_robot_hw-0.15.0.ebuild 469 BLAKE2B 044469c633f200170ddd3d070f98288bdb743e6ecb4c629a50d04a5bdd51508b9eddc1b192e9eb941400e62b6f307f838552c1d3598d292b12cff0eb9b34e0b9 SHA512 f3c945807062eac38f6e83fdcb1431d05f78d1cd88c1907754e205f56ca00a5f046377f747e19d4feb888e30df17675ed2cc3842dbc53ac46cdc61ff61bf8307
-EBUILD combined_robot_hw-0.15.1.ebuild 466 BLAKE2B 70b3d23b6b256ab8ebd4c24df2f77618211758b0df214fb731ed3877f352269d19c74961840996ba86708cb8ed772884dd9451654d7576b626d8884c77db3d4a SHA512 94b74ab03c6db3bd88d0fdc37b656e540075cb9c66604d1555faa2fe14d8ff70381802f0414cff60ac5a2476d852bb3a8a893cfaa398ec8d95300b7e17145a39
-EBUILD combined_robot_hw-9999.ebuild 469 BLAKE2B 044469c633f200170ddd3d070f98288bdb743e6ecb4c629a50d04a5bdd51508b9eddc1b192e9eb941400e62b6f307f838552c1d3598d292b12cff0eb9b34e0b9 SHA512 f3c945807062eac38f6e83fdcb1431d05f78d1cd88c1907754e205f56ca00a5f046377f747e19d4feb888e30df17675ed2cc3842dbc53ac46cdc61ff61bf8307
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD combined_robot_hw-0.19.1.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
+EBUILD combined_robot_hw-9999.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/combined_robot_hw/combined_robot_hw-0.14.2.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.14.2.ebuild
deleted file mode 100644
index 9bb0b92638d0..000000000000
--- a/dev-ros/combined_robot_hw/combined_robot_hw-0.14.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- >=dev-ros/hardware_interface-0.11
- dev-ros/pluginlib
- dev-libs/tinyxml2:=
- dev-ros/roscpp
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/combined_robot_hw/combined_robot_hw-0.15.0.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.15.0.ebuild
deleted file mode 100644
index 99715e8c95e0..000000000000
--- a/dev-ros/combined_robot_hw/combined_robot_hw-0.15.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- >=dev-ros/hardware_interface-0.15
- dev-ros/pluginlib
- dev-libs/tinyxml2:=
- dev-ros/roscpp
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/combined_robot_hw/combined_robot_hw-0.15.1.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.15.1.ebuild
deleted file mode 100644
index 3b7d67c426e0..000000000000
--- a/dev-ros/combined_robot_hw/combined_robot_hw-0.15.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- >=dev-ros/hardware_interface-0.15
- dev-ros/pluginlib
- dev-libs/tinyxml2:=
- dev-ros/roscpp
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/combined_robot_hw/combined_robot_hw-0.19.1.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.19.1.ebuild
new file mode 100644
index 000000000000..321a5d7c964b
--- /dev/null
+++ b/dev-ros/combined_robot_hw/combined_robot_hw-0.19.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Combined Robot HW class"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ >=dev-ros/hardware_interface-0.15
+ dev-ros/pluginlib
+ dev-libs/tinyxml2:=
+ dev-ros/roscpp
+ dev-libs/boost:=
+ dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/combined_robot_hw/combined_robot_hw-9999.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-9999.ebuild
index 99715e8c95e0..321a5d7c964b 100644
--- a/dev-ros/combined_robot_hw/combined_robot_hw-9999.ebuild
+++ b/dev-ros/combined_robot_hw/combined_robot_hw-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-controls/ros_control"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
diff --git a/dev-ros/combined_robot_hw_tests/Manifest b/dev-ros/combined_robot_hw_tests/Manifest
index 25ad1668da61..5aefdc04ca46 100644
--- a/dev-ros/combined_robot_hw_tests/Manifest
+++ b/dev-ros/combined_robot_hw_tests/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD combined_robot_hw_tests-0.14.2.ebuild 589 BLAKE2B 4a175543e9901120894ca1f361f683d5e54fd1a22422313e46acbef335b6e6367795ad8805f4ba0313a3febcbd303df21d1c61ed0e1698a5c85f4df6cbb60692 SHA512 b6d58964feaec3d7bc88230a61041362e43baea4de3e2684258a508940fd9473745890074c90de9d02ca8c9bbb06c802e3cf4c44980017f96644e47ef874b173
-EBUILD combined_robot_hw_tests-0.15.0.ebuild 589 BLAKE2B 4a175543e9901120894ca1f361f683d5e54fd1a22422313e46acbef335b6e6367795ad8805f4ba0313a3febcbd303df21d1c61ed0e1698a5c85f4df6cbb60692 SHA512 b6d58964feaec3d7bc88230a61041362e43baea4de3e2684258a508940fd9473745890074c90de9d02ca8c9bbb06c802e3cf4c44980017f96644e47ef874b173
-EBUILD combined_robot_hw_tests-0.15.1.ebuild 586 BLAKE2B db81f31c6d64cc9c70e986d840cb553d9020c769dee49f3739b3c3d24864970f57cb51f27abef12017395b4ba58068e10482a9b31433378bde8564710f4104e1 SHA512 9be8857413fb81279341f3a4c5f77c70b8a947b4b281404c0f639acf2dffddfffaa4178a691be50b4a34767227efddc759cc1b76fe8028a7b311feeca6077350
-EBUILD combined_robot_hw_tests-9999.ebuild 589 BLAKE2B bad2e5cab92497c62e4a0d68b3db266c0e0b943d38ef10061137a3a6dada62e7e900faa4b4668d5632ff560d8153f2ee6d1c6c6948bb6e4b97810903fafbfd58 SHA512 d712002b21634dad8314f7bceeead5210a093fc433aa03ebe22db5d0ccb94f09289b2c78c7c6df143f660ba89a6aafd61f5279bd1c7ba5ffe93034f9b897d3fe
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD combined_robot_hw_tests-0.19.1.ebuild 558 BLAKE2B ae14413dd67df3b248aab8c6386d7d0947b752a12496893369278e4432ab27e846fc57b45379ea1c383b928715575d6f154f064bdcfe8e13a61f0c622716310e SHA512 7df0518bf0b25ba0515de8758134cf1dc3ad65e05662bd0830eb24489285df77ce9844a1a1f7187541c510fda365c7cf149b8e79d7550fc6e233ae72bbd1ab13
+EBUILD combined_robot_hw_tests-9999.ebuild 558 BLAKE2B ae14413dd67df3b248aab8c6386d7d0947b752a12496893369278e4432ab27e846fc57b45379ea1c383b928715575d6f154f064bdcfe8e13a61f0c622716310e SHA512 7df0518bf0b25ba0515de8758134cf1dc3ad65e05662bd0830eb24489285df77ce9844a1a1f7187541c510fda365c7cf149b8e79d7550fc6e233ae72bbd1ab13
MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.14.2.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.14.2.ebuild
deleted file mode 100644
index e23c205a4524..000000000000
--- a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.14.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/combined_robot_hw
- dev-ros/controller_manager
- dev-ros/controller_manager_tests
- dev-ros/hardware_interface
- dev-ros/roscpp
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.15.0.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.15.0.ebuild
deleted file mode 100644
index e23c205a4524..000000000000
--- a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.15.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/combined_robot_hw
- dev-ros/controller_manager
- dev-ros/controller_manager_tests
- dev-ros/hardware_interface
- dev-ros/roscpp
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.15.1.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.15.1.ebuild
deleted file mode 100644
index 9c9859bfbe6c..000000000000
--- a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.15.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/combined_robot_hw
- dev-ros/controller_manager
- dev-ros/controller_manager_tests
- dev-ros/hardware_interface
- dev-ros/roscpp
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.1.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.1.ebuild
new file mode 100644
index 000000000000..6c3e539c4e5b
--- /dev/null
+++ b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Combined Robot HW class tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/combined_robot_hw
+ dev-ros/controller_manager
+ dev-ros/controller_manager_tests
+ dev-ros/hardware_interface
+ dev-ros/roscpp
+ dev-libs/boost:=
+ dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild
index fca1073283bc..6c3e539c4e5b 100644
--- a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild
+++ b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-controls/ros_control"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/compressed_depth_image_transport/Manifest b/dev-ros/compressed_depth_image_transport/Manifest
index b44237b93bb9..5f7812d0b27c 100644
--- a/dev-ros/compressed_depth_image_transport/Manifest
+++ b/dev-ros/compressed_depth_image_transport/Manifest
@@ -1,5 +1,4 @@
-AUX ocv4.patch 534 BLAKE2B 344016d8bacd6f2ee93604a94fb82a2b548b584540d8d39a6910d6ba7ed9882667e8da47f6b2654a9cc89e0424944728e34bb97a02ddba23f8621bd26baf9e1d SHA512 890b27946567e9290250bb8af10821ba8519dead141c8ff22cb2be8a201ca6bf26955503edbd767dec878a77609c3d9d50adefb8f02b75ce1d4aee8a2998d5b9
-DIST image_transport_plugins-1.9.5.tar.gz 26268 BLAKE2B 2d7e71f891bc3ae548193a9671fb10fb4dc6c7a24fda0c0dc52d75d43793d55e35da37155496740624e4ebe34fcf0e8d3926345ca1581fa521096c01b773f551 SHA512 54f459719a386f028578889f9b88b8b080f495d75899cee6c8bfb58204970fb2395b2a8da70034eb391ba62f4ce462cb89b97bcdc576a177444613076b5ed02c
-EBUILD compressed_depth_image_transport-1.9.5-r1.ebuild 637 BLAKE2B 1d292d3d1600dd00176be37b0855767ed69d37cb99a96b2cbdab227ae34331cf40e91cad68b0a4967de854b2e20f95598b1fdc44ed35951addb4d7274224d789 SHA512 2eb7fe38a27eb416b12d0de400cac49fd68e475264ef1f2be2fdc5a3051c8ff80626daba2141849d21104f6cf3eecf7e11ab3b2a690e74fdecc089d5d66e8bf0
-EBUILD compressed_depth_image_transport-9999.ebuild 599 BLAKE2B a522cfae31f5b06a5c71893ec4219a50f108f6cab778cf6af8f819c3bd9929fa4f12825eb9e4dccdaa2679975e4cd30e19ed9057875c9370e847c9761ca4d0bf SHA512 f7e0dbab6bf3f1bd59e90d5569b4df97ba210fafe2883f2125c98da1675b1203d84790ee1e10958f7912eef478d29235735b0d3e246006bc40aedbeaba14583d
+DIST image_transport_plugins-1.14.0.tar.gz 28803 BLAKE2B fc3fc34c0dc01c5dc0ed7f2a88fd691f9b955009bbf91a2280e39455e0325a46edc67c25cf79d8e4882789c20235c13fb87bfc64669ffda40a1fe37224a346e9 SHA512 1333f18a3208ecda4f788dc2d974b5787a89d33a1ad1ea2c6b4cc07593c677686aa5e9df3346d2e5f307699b88b42f341a989eebecc3cd7885768e3dcdbbcdcb
+EBUILD compressed_depth_image_transport-1.14.0.ebuild 549 BLAKE2B e798b36c4432afba44483e44d2f00243addbff3a3d47d717532647ef454b7045bb0cd57512ebb6609d6133bd770f0fe6cf0eaaae58e1271d70acb4b8d867bed2 SHA512 834822b7201fffa1eaa2884f16961632ab6fe4577d6e766146755de29946acedef6fd2ca44583b819da708a7aa2d18e3f8354d541cff48b88b8a84d97ff4c55f
+EBUILD compressed_depth_image_transport-9999.ebuild 549 BLAKE2B e798b36c4432afba44483e44d2f00243addbff3a3d47d717532647ef454b7045bb0cd57512ebb6609d6133bd770f0fe6cf0eaaae58e1271d70acb4b8d867bed2 SHA512 834822b7201fffa1eaa2884f16961632ab6fe4577d6e766146755de29946acedef6fd2ca44583b819da708a7aa2d18e3f8354d541cff48b88b8a84d97ff4c55f
MISC metadata.xml 352 BLAKE2B d741d3235de6a630917b5785819ea9a3b13d8602bc5fd27b9fb8d4cea1df216fb64eaa0fd2fee5c5f11012a823311155331e2ae65af23874322679dc57bc32a9 SHA512 855c756eea98c52acb020fb394646008db35b41b864a0983f67bbf07ffce658d394c0de13d6622286770e4aa4152b74f2f6028c575b11b66233431d1fffa0347
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild
new file mode 100644
index 000000000000..b00889e4a778
--- /dev/null
+++ b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Plugin for transparently sending depth images using PNG compression"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge
+ dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+ dev-ros/image_transport
+ media-libs/opencv:=
+ dev-libs/boost:=
+ dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild
deleted file mode 100644
index d3bccdcdc1cc..000000000000
--- a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Plugin to image_transport for transparently sending depth images using PNG compression"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
- dev-ros/image_transport
- >=media-libs/opencv-4:=
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
index d4ef693e9dd2..b00889e4a778 100644
--- a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
+++ b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
-DESCRIPTION="Plugin to image_transport for transparently sending depth images using PNG compression"
+DESCRIPTION="Plugin for transparently sending depth images using PNG compression"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/compressed_depth_image_transport/files/ocv4.patch b/dev-ros/compressed_depth_image_transport/files/ocv4.patch
deleted file mode 100644
index 9d1c7d79ce62..000000000000
--- a/dev-ros/compressed_depth_image_transport/files/ocv4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: compressed_depth_image_transport/src/codec.cpp
-===================================================================
---- compressed_depth_image_transport.orig/src/codec.cpp
-+++ compressed_depth_image_transport/src/codec.cpp
-@@ -135,7 +135,7 @@ sensor_msgs::Image::Ptr decodeCompressed
- // Decode raw image
- try
- {
-- cv_ptr->image = cv::imdecode(imageData, CV_LOAD_IMAGE_UNCHANGED);
-+ cv_ptr->image = cv::imdecode(imageData, cv::IMREAD_UNCHANGED);
- }
- catch (cv::Exception& e)
- {
diff --git a/dev-ros/compressed_image_transport/Manifest b/dev-ros/compressed_image_transport/Manifest
index c31e789ccc48..f0f41475f627 100644
--- a/dev-ros/compressed_image_transport/Manifest
+++ b/dev-ros/compressed_image_transport/Manifest
@@ -1,5 +1,4 @@
-AUX ocv4.patch 823 BLAKE2B e435db081e4fb82fb3ab6a0aa46dc157c06c5d4e89b8f93bca737300b4a34c63a77101907e0ccd4d11764a5aeba084cbba98fa25cd5eb0923217cb6961b207da SHA512 0372e0c4401424dccd6e5e20d9d9eae37a7d38801a2d73a93631545d347569a685d9540a9e73b65db83e8cb6499874e0675b1eed25d0b0a8c9ca5c6557609ccb
-DIST image_transport_plugins-1.9.5.tar.gz 26268 BLAKE2B 2d7e71f891bc3ae548193a9671fb10fb4dc6c7a24fda0c0dc52d75d43793d55e35da37155496740624e4ebe34fcf0e8d3926345ca1581fa521096c01b773f551 SHA512 54f459719a386f028578889f9b88b8b080f495d75899cee6c8bfb58204970fb2395b2a8da70034eb391ba62f4ce462cb89b97bcdc576a177444613076b5ed02c
-EBUILD compressed_image_transport-1.9.5-r1.ebuild 632 BLAKE2B 5431debfeda9cf204fa8e3213d7524de051885ee2db0e2b5b96e11f1f34ea2a7cfb0b3c6e2d353b07b1539f43448df400374ecb5bf7ba6dbd112cd0b5fd9cc6f SHA512 33dc22784dcc6ab9fd4ce13c17e9cf42342cd2f60f2494b7c0ab1816495a615ada381ae94e12d4c12f05ebc60318ae00a30132693cf9a169d0ff14d18342612c
-EBUILD compressed_image_transport-9999.ebuild 594 BLAKE2B 0371f8f25fc02e5ce6dc843a2642c0bf9138f1696ec940bff8508a79bc66ccc193f317610a8587720f6c6daf0db53feec6b82bcd8d8d63815dd0b481fc8f82f1 SHA512 f5711ff9ac19b3f2d38627aee4c2e7ea88202d892eff1cd38ef6e256173a81e4e4245034f01cd0c80b4feb01e2a44ea3e8e1b97dfef18882465813ab529c2fc5
+DIST image_transport_plugins-1.14.0.tar.gz 28803 BLAKE2B fc3fc34c0dc01c5dc0ed7f2a88fd691f9b955009bbf91a2280e39455e0325a46edc67c25cf79d8e4882789c20235c13fb87bfc64669ffda40a1fe37224a346e9 SHA512 1333f18a3208ecda4f788dc2d974b5787a89d33a1ad1ea2c6b4cc07593c677686aa5e9df3346d2e5f307699b88b42f341a989eebecc3cd7885768e3dcdbbcdcb
+EBUILD compressed_image_transport-1.14.0.ebuild 544 BLAKE2B 5b670690994df92d0025b7214b18acc3a623d61e9f392246d73255e38d17e3e354be8bc806c85213bae0c36682ac0d43e20a552bbc18262fc2b37866704c331e SHA512 0bdbf7a394c3282934e2485912f4235e95f5d9a8acadad4a2b6632c03d0f270703769fb169c322aaebbe2f13f7d8e4a2df4f4c0b23f792fbb2869941ce19b2dc
+EBUILD compressed_image_transport-9999.ebuild 544 BLAKE2B 5b670690994df92d0025b7214b18acc3a623d61e9f392246d73255e38d17e3e354be8bc806c85213bae0c36682ac0d43e20a552bbc18262fc2b37866704c331e SHA512 0bdbf7a394c3282934e2485912f4235e95f5d9a8acadad4a2b6632c03d0f270703769fb169c322aaebbe2f13f7d8e4a2df4f4c0b23f792fbb2869941ce19b2dc
MISC metadata.xml 352 BLAKE2B d741d3235de6a630917b5785819ea9a3b13d8602bc5fd27b9fb8d4cea1df216fb64eaa0fd2fee5c5f11012a823311155331e2ae65af23874322679dc57bc32a9 SHA512 855c756eea98c52acb020fb394646008db35b41b864a0983f67bbf07ffce658d394c0de13d6622286770e4aa4152b74f2f6028c575b11b66233431d1fffa0347
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild
new file mode 100644
index 000000000000..b7faa0af94db
--- /dev/null
+++ b/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Plugin for transparently sending images encoded as JPEG or PNG"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge
+ dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+ dev-ros/image_transport
+ media-libs/opencv:=
+ dev-libs/boost:=
+ dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild
deleted file mode 100644
index 044d1c361210..000000000000
--- a/dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Plugin to image_transport for transparently sending images encoded as JPEG or PNG"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
- dev-ros/image_transport
- >=media-libs/opencv-4:=
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
index 46fc32014194..b7faa0af94db 100644
--- a/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
+++ b/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
-DESCRIPTION="Plugin to image_transport for transparently sending images encoded as JPEG or PNG"
+DESCRIPTION="Plugin for transparently sending images encoded as JPEG or PNG"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/compressed_image_transport/files/ocv4.patch b/dev-ros/compressed_image_transport/files/ocv4.patch
deleted file mode 100644
index 6b3406b5c006..000000000000
--- a/dev-ros/compressed_image_transport/files/ocv4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: compressed_image_transport/src/compressed_publisher.cpp
-===================================================================
---- compressed_image_transport.orig/src/compressed_publisher.cpp
-+++ compressed_image_transport/src/compressed_publisher.cpp
-@@ -97,7 +97,7 @@ void CompressedPublisher::publish(const
- // JPEG Compression
- case JPEG:
- {
-- params[0] = CV_IMWRITE_JPEG_QUALITY;
-+ params[0] = cv::IMWRITE_JPEG_QUALITY;
- params[1] = config_.jpeg_quality;
-
- // Update ros message format header
-@@ -154,7 +154,7 @@ void CompressedPublisher::publish(const
- // PNG Compression
- case PNG:
- {
-- params[0] = CV_IMWRITE_PNG_COMPRESSION;
-+ params[0] = cv::IMWRITE_PNG_COMPRESSION;
- params[1] = config_.png_level;
-
- // Update ros message format header
diff --git a/dev-ros/controller_interface/Manifest b/dev-ros/controller_interface/Manifest
index 51b6686d2f70..b9aa95cef625 100644
--- a/dev-ros/controller_interface/Manifest
+++ b/dev-ros/controller_interface/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD controller_interface-0.14.2.ebuild 408 BLAKE2B ee1309c20ed563389b1480dfac5f10297b1285690c000d83752682afb1c6a7cd448cc92dc799c67f0a1253315acf578d211b833d2438b12c6ccbdec1dab8ed8c SHA512 e629261c89a8acc3c83d7f955b5b93b3df0adc23de7a39023b6e9bce360a9464162873f348ce2f02386cf0a640ceb3daead3f12a040bf646d66d2179d167fdaa
-EBUILD controller_interface-0.15.0.ebuild 408 BLAKE2B ee1309c20ed563389b1480dfac5f10297b1285690c000d83752682afb1c6a7cd448cc92dc799c67f0a1253315acf578d211b833d2438b12c6ccbdec1dab8ed8c SHA512 e629261c89a8acc3c83d7f955b5b93b3df0adc23de7a39023b6e9bce360a9464162873f348ce2f02386cf0a640ceb3daead3f12a040bf646d66d2179d167fdaa
-EBUILD controller_interface-0.15.1.ebuild 405 BLAKE2B b1cba0340f1e729d15b15bfc65c3c37b66b28266390b73a4e2065caa7d0307de58ed815fbcf98ee22ad7f0175687f2eff83d344e8f2a2bd564a1feb2ccd51d5b SHA512 07e6a7656b2beb125db8771ee36fa387bb76bb935d4d8ce7e709a1e442492b9bfa1257ec35247e1119d5f31ced8b329875571740fdb777ba5c74590968ffa6db
-EBUILD controller_interface-9999.ebuild 408 BLAKE2B 97811b917ce93d4db53d5411bbbb03a8f02f07703c4cea04a796570d3308d3a5dda73a7948f1e173584d36c343d472a5c0147429ca975a733b5854983276ccff SHA512 778dbbec3af738e3cb52f818b7b1ff9a190b61f3fea575c2e2e3b0c7de92ae9011a1f8ddc6c7cb10e0f26f3d0e4100f0ba0e8d2b9cc01cf692951ba579fa7519
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD controller_interface-0.19.1.ebuild 405 BLAKE2B 1ea887b382d5935784345c6555ac1b69e952c143f5dc8cc37a521be0282b6edf2a8421f9485260b8d05accd3cf37a2041a211bc86389f738ea17bf61677d39eb SHA512 2781fa0ccd5b794314660a14103551f1b82bc8c391cd528616a726e82c21d1157e66069e94ee6099ae7de340791bf30065de0f42e0dad4429881cc4a41ac9999
+EBUILD controller_interface-9999.ebuild 405 BLAKE2B 1ea887b382d5935784345c6555ac1b69e952c143f5dc8cc37a521be0282b6edf2a8421f9485260b8d05accd3cf37a2041a211bc86389f738ea17bf61677d39eb SHA512 2781fa0ccd5b794314660a14103551f1b82bc8c391cd528616a726e82c21d1157e66069e94ee6099ae7de340791bf30065de0f42e0dad4429881cc4a41ac9999
MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_interface/controller_interface-0.14.2.ebuild b/dev-ros/controller_interface/controller_interface-0.14.2.ebuild
deleted file mode 100644
index e8684ba4ea1c..000000000000
--- a/dev-ros/controller_interface/controller_interface-0.14.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interface base class for controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/hardware_interface
- dev-ros/pluginlib
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_interface/controller_interface-0.15.0.ebuild b/dev-ros/controller_interface/controller_interface-0.15.0.ebuild
deleted file mode 100644
index e8684ba4ea1c..000000000000
--- a/dev-ros/controller_interface/controller_interface-0.15.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interface base class for controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/hardware_interface
- dev-ros/pluginlib
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_interface/controller_interface-0.15.1.ebuild b/dev-ros/controller_interface/controller_interface-0.15.1.ebuild
deleted file mode 100644
index d24990956627..000000000000
--- a/dev-ros/controller_interface/controller_interface-0.15.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interface base class for controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/hardware_interface
- dev-ros/pluginlib
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_interface/controller_interface-0.19.1.ebuild b/dev-ros/controller_interface/controller_interface-0.19.1.ebuild
new file mode 100644
index 000000000000..a958eb8c333c
--- /dev/null
+++ b/dev-ros/controller_interface/controller_interface-0.19.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Interface base class for controllers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/hardware_interface
+ dev-ros/pluginlib
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_interface/controller_interface-9999.ebuild b/dev-ros/controller_interface/controller_interface-9999.ebuild
index f3d2ab9e4d58..a958eb8c333c 100644
--- a/dev-ros/controller_interface/controller_interface-9999.ebuild
+++ b/dev-ros/controller_interface/controller_interface-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-controls/ros_control"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
diff --git a/dev-ros/controller_manager/Manifest b/dev-ros/controller_manager/Manifest
index 111c2ea97843..7ed13c920844 100644
--- a/dev-ros/controller_manager/Manifest
+++ b/dev-ros/controller_manager/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD controller_manager-0.14.2.ebuild 803 BLAKE2B 2f5f1b9769f8683e9e3a6f1cfef75de57a9e27597643c56195842292cec7f93aba06900784290ca57e8251f967bde5c87fa5aaa7c394eede04f05d64b96b68d5 SHA512 8d827c6174ade1dc685037ab86a3de54990a51efef3a6cb24359e9d5019f1acaec5ffe8c4057424553f4e7cf30f3ce298ccfb2f4f433c740416b9ff5b8c8463e
-EBUILD controller_manager-0.15.0.ebuild 810 BLAKE2B b38ba0db00655bd8a15c6da10ff3a6af83c210f4edbc70c0894912d5fb3aa662938282cf4c85e5518181babeea85452dfff40a7daef4df6d795729b80d5a9e2b SHA512 63943aa95b08f1c0eebe21496cd81028a84a0d4fbd353c4119daa92da0ef354306779da6814bfe1bd9ec8cddaa2f23a5980ffcbd7fbd9121d1693a28467b7fbd
-EBUILD controller_manager-0.15.1.ebuild 807 BLAKE2B 42bbac7dd17a30d80741b52178dc6ba14ea15d56b19b976129a199db25cd5f1d2f5dc1dc07c068b9c8a38766653d3ca3aeaf0d40a44001b241ad3ff451a7f7e6 SHA512 267c286781cec7b7039191bed1e8ffbaa95c2779295f66c405ddc3a5723403ba2ce1762be954febdaf09d2864eebc255f5052edb928d468a06c15d8db9269a21
-EBUILD controller_manager-9999.ebuild 810 BLAKE2B b38ba0db00655bd8a15c6da10ff3a6af83c210f4edbc70c0894912d5fb3aa662938282cf4c85e5518181babeea85452dfff40a7daef4df6d795729b80d5a9e2b SHA512 63943aa95b08f1c0eebe21496cd81028a84a0d4fbd353c4119daa92da0ef354306779da6814bfe1bd9ec8cddaa2f23a5980ffcbd7fbd9121d1693a28467b7fbd
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD controller_manager-0.19.1.ebuild 779 BLAKE2B ddc04c454ad6f4d288ceb3c6a70049328e49afd252490d103f4c764d59c793130ddd80c52bf072396470680ecef672b01294521b4665c0dbf20aed93602b11e1 SHA512 35b0d1de751568143cda163589a5fc70fc1d39e9d02a6ccb85aa14d2ae2e04eebd7a85d435c6be797beb8e5643d752fca7ff695e74ece9404079181a3b0ed906
+EBUILD controller_manager-9999.ebuild 779 BLAKE2B ddc04c454ad6f4d288ceb3c6a70049328e49afd252490d103f4c764d59c793130ddd80c52bf072396470680ecef672b01294521b4665c0dbf20aed93602b11e1 SHA512 35b0d1de751568143cda163589a5fc70fc1d39e9d02a6ccb85aa14d2ae2e04eebd7a85d435c6be797beb8e5643d752fca7ff695e74ece9404079181a3b0ed906
MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager/controller_manager-0.14.2.ebuild b/dev-ros/controller_manager/controller_manager-0.14.2.ebuild
deleted file mode 100644
index c25eb8f6ab18..000000000000
--- a/dev-ros/controller_manager/controller_manager-0.14.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/controller_interface
- >=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
- >=dev-ros/hardware_interface-0.10.0
- dev-ros/pluginlib
- dev-libs/tinyxml2:=
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/controller_manager/controller_manager-0.15.0.ebuild b/dev-ros/controller_manager/controller_manager-0.15.0.ebuild
deleted file mode 100644
index 53f3342904a0..000000000000
--- a/dev-ros/controller_manager/controller_manager-0.15.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- >=dev-ros/controller_interface-0.15
- >=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
- >=dev-ros/hardware_interface-0.10.0
- dev-ros/pluginlib
- dev-libs/tinyxml2:=
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/controller_manager/controller_manager-0.15.1.ebuild b/dev-ros/controller_manager/controller_manager-0.15.1.ebuild
deleted file mode 100644
index a6d49e76c54a..000000000000
--- a/dev-ros/controller_manager/controller_manager-0.15.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- >=dev-ros/controller_interface-0.15
- >=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
- >=dev-ros/hardware_interface-0.10.0
- dev-ros/pluginlib
- dev-libs/tinyxml2:=
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/controller_manager/controller_manager-0.19.1.ebuild b/dev-ros/controller_manager/controller_manager-0.19.1.ebuild
new file mode 100644
index 000000000000..f42146203d19
--- /dev/null
+++ b/dev-ros/controller_manager/controller_manager-0.19.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="The controller manager"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ >=dev-ros/controller_interface-0.15
+ >=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+ >=dev-ros/hardware_interface-0.10.0
+ dev-ros/pluginlib
+ dev-libs/tinyxml2:=
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-ros/rosparam[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-libs/boost:=
+ dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/controller_manager/controller_manager-9999.ebuild b/dev-ros/controller_manager/controller_manager-9999.ebuild
index 53f3342904a0..f42146203d19 100644
--- a/dev-ros/controller_manager/controller_manager-9999.ebuild
+++ b/dev-ros/controller_manager/controller_manager-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-controls/ros_control"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/controller_manager_msgs/Manifest b/dev-ros/controller_manager_msgs/Manifest
index ffc049c79cc8..d8a142455e90 100644
--- a/dev-ros/controller_manager_msgs/Manifest
+++ b/dev-ros/controller_manager_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD controller_manager_msgs-0.14.2.ebuild 464 BLAKE2B 4f8100aa36c9b5ed5450c51b40791032a1079d7370ca9ed19b84368e1debc3a3aa617e9669eec73c47cceaf32eed781034e17372f7a9fffe34819e609d1c5208 SHA512 7c65d5b107e50dcaae9994af726a343d89c0259ca6bff92e8d5cdefd6185728ba66d14e1e7a457c3643ce5e5650274d5c86c220fee2308cfcf3c85d5a7e89b98
-EBUILD controller_manager_msgs-0.15.0.ebuild 464 BLAKE2B 4f8100aa36c9b5ed5450c51b40791032a1079d7370ca9ed19b84368e1debc3a3aa617e9669eec73c47cceaf32eed781034e17372f7a9fffe34819e609d1c5208 SHA512 7c65d5b107e50dcaae9994af726a343d89c0259ca6bff92e8d5cdefd6185728ba66d14e1e7a457c3643ce5e5650274d5c86c220fee2308cfcf3c85d5a7e89b98
-EBUILD controller_manager_msgs-0.15.1.ebuild 461 BLAKE2B a2c8a19380acc283d95d721522d41d36bd032f84cd3e11bec420fdad9d9a843a0fc8482edf18613171dddfb251376b2a436a6d124e02927e1d50647090eb4399 SHA512 d066c6af5b3a769bd0f761ee7e2b834a6f06f58c47c688dd73b74e89513cd1c9883e8bd0e28ab0cfd4dc178d79ac35a21d0a3244a37b8f31f93db08d8b54f116
-EBUILD controller_manager_msgs-9999.ebuild 464 BLAKE2B db06a2ed1f6f299d1182d20fcff079a682a71cd048788b9a8eb2076211912d72443cd7aa3f6f0022b7432d6b058b231ab1490e29e7fc9bbe10c8744a930d07e4 SHA512 5c147fd4b7e6e64db8d0d804f8110825e41eb2c511da37b49117fb09a898fc271049b7c7d5565684493163dd0012c40442a7f637a39bb1d6e0785fd23b152998
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD controller_manager_msgs-0.19.1.ebuild 433 BLAKE2B cf039fd04fcbfdea6539989a3884e4131cde1d7b1967e27b639dca1345dd369a0b9021c1420edd07c253f3bd373afc8cc565a0bb618fd24cfa0330c95702d451 SHA512 53c4e647956677fab828c9ed91d28fcc1de99b337f1de83376fcf1652ad5139f2e8661f516026646d8e81e9ad7318627ed55d2dde8f4b8e8d4db293719d09754
+EBUILD controller_manager_msgs-9999.ebuild 433 BLAKE2B cf039fd04fcbfdea6539989a3884e4131cde1d7b1967e27b639dca1345dd369a0b9021c1420edd07c253f3bd373afc8cc565a0bb618fd24cfa0330c95702d451 SHA512 53c4e647956677fab828c9ed91d28fcc1de99b337f1de83376fcf1652ad5139f2e8661f516026646d8e81e9ad7318627ed55d2dde8f4b8e8d4db293719d09754
MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.14.2.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.14.2.ebuild
deleted file mode 100644
index 6139986be33e..000000000000
--- a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.14.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rospy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.15.0.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.15.0.ebuild
deleted file mode 100644
index 6139986be33e..000000000000
--- a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.15.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rospy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.15.1.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.15.1.ebuild
deleted file mode 100644
index 70b132e01e6b..000000000000
--- a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.15.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rospy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.1.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.1.ebuild
new file mode 100644
index 000000000000..d14b8c4301ab
--- /dev/null
+++ b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="The controller manager"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rospy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-9999.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-9999.ebuild
index a1d99eb3980f..d14b8c4301ab 100644
--- a/dev-ros/controller_manager_msgs/controller_manager_msgs-9999.ebuild
+++ b/dev-ros/controller_manager_msgs/controller_manager_msgs-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-controls/ros_control"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
CATKIN_HAS_MESSAGES=yes
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
diff --git a/dev-ros/controller_manager_tests/Manifest b/dev-ros/controller_manager_tests/Manifest
index 4afe4dd2535f..548d9eece2cc 100644
--- a/dev-ros/controller_manager_tests/Manifest
+++ b/dev-ros/controller_manager_tests/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD controller_manager_tests-0.14.2.ebuild 638 BLAKE2B 9862addeb71f04c83bf900382f2abdaa8dbd20f1d2c5d6cdcc04edfa6ae085b3a9d07459f50b36c29d71ff598e4f4af04ac50a0d958f2a8dc7b07d0b46965f35 SHA512 150ccf5b065c5fda48ccd1f045aa6d90408802fa1fdf24d3bb01141755454fa2a76df2542fb0cba9b0a46962f5ffc3861a66cb7adcf1cbe26ee8606c76d18e5d
-EBUILD controller_manager_tests-0.15.0.ebuild 638 BLAKE2B 9862addeb71f04c83bf900382f2abdaa8dbd20f1d2c5d6cdcc04edfa6ae085b3a9d07459f50b36c29d71ff598e4f4af04ac50a0d958f2a8dc7b07d0b46965f35 SHA512 150ccf5b065c5fda48ccd1f045aa6d90408802fa1fdf24d3bb01141755454fa2a76df2542fb0cba9b0a46962f5ffc3861a66cb7adcf1cbe26ee8606c76d18e5d
-EBUILD controller_manager_tests-0.15.1.ebuild 635 BLAKE2B 16e33d2420cfcfa944e9e17fcd4fd2eddb9b8992eb50d0d398c93fc7a23e102208348d24a205f470605f91dff8fecdff37088e84a0668523a0177a45c73f6e63 SHA512 ed3b16c14ff0dae401ae581fa17958f881cab60aef679fafd3fd4e96916760df35a3dae70cbb54f407931b6b08d798ebd16051a450c9defeb73a9cf5ca2138df
-EBUILD controller_manager_tests-9999.ebuild 638 BLAKE2B c29f7638adef4694e94db2d2b75ee1aae1bd7cbd7be614e506a5dd057645d9c08735d6a799c4aa65d3fa53ca320de05d21a0d4d7546a291b559266ce15592c9d SHA512 f2d2980f53c20872fa638ffa9000b26e98be51f705a81a4483482fc29d28ab4ebddd14ae524c40ac00ae746d9f106eda05821555abc2c5e1225c1c8a9f703d80
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD controller_manager_tests-0.19.1.ebuild 607 BLAKE2B b2056495a980d05bce230e0b3a8e92f47cb0675b9eeeccf526fb4566c90f86c50bed32ed84ce3ee29ff9ce8decb180896491fca709d2373ef3ecd2eb830cf440 SHA512 1b7b0dea788b87504bf162a42a5f7029c85c0bb8effe2330ae9746ac8b260928737e727fd7eeebd892b73e2c9cd7c1ff5361568817fdd0113b02e181e53f93eb
+EBUILD controller_manager_tests-9999.ebuild 607 BLAKE2B b2056495a980d05bce230e0b3a8e92f47cb0675b9eeeccf526fb4566c90f86c50bed32ed84ce3ee29ff9ce8decb180896491fca709d2373ef3ecd2eb830cf440 SHA512 1b7b0dea788b87504bf162a42a5f7029c85c0bb8effe2330ae9746ac8b260928737e727fd7eeebd892b73e2c9cd7c1ff5361568817fdd0113b02e181e53f93eb
MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.14.2.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.14.2.ebuild
deleted file mode 100644
index e78a04991c3d..000000000000
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.14.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for the controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/controller_manager[${PYTHON_USEDEP}]
- dev-ros/controller_interface
- dev-ros/control_toolbox
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rosservice[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.15.0.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.15.0.ebuild
deleted file mode 100644
index e78a04991c3d..000000000000
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.15.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for the controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/controller_manager[${PYTHON_USEDEP}]
- dev-ros/controller_interface
- dev-ros/control_toolbox
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rosservice[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.15.1.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.15.1.ebuild
deleted file mode 100644
index 77cb39291f47..000000000000
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.15.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for the controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/controller_manager[${PYTHON_USEDEP}]
- dev-ros/controller_interface
- dev-ros/control_toolbox
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rosservice[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild
new file mode 100644
index 000000000000..dca05eab9222
--- /dev/null
+++ b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tests for the controller manager"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/controller_manager[${PYTHON_USEDEP}]
+ dev-ros/controller_interface
+ dev-ros/control_toolbox
+ dev-libs/boost:=
+ dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-ros/rosservice[${PYTHON_USEDEP}]
+ )"
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
index 64df454d8fb0..dca05eab9222 100644
--- a/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
+++ b/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-controls/ros_control"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/depth_image_proc/Manifest b/dev-ros/depth_image_proc/Manifest
index d0155ab1382c..01397245d192 100644
--- a/dev-ros/depth_image_proc/Manifest
+++ b/dev-ros/depth_image_proc/Manifest
@@ -1,8 +1,4 @@
-DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
-DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
-EBUILD depth_image_proc-1.12.22-r1.ebuild 732 BLAKE2B 16cf7f434921ef6754dee1ef95da566b2a13267c9b51f6d8da7515e36e8696da505e1a43650c0536595e0ab12912b7176ad4f0aecaaaf6bd77c9fd957c28f28c SHA512 c81f37aacce8a8ea5a41d735e6411d8a03b8ae834ee76ffc54dffc46296c7afae845cbfadae49bc189d9438e81569bab82eb2e4d0e193bc836e8b47e079e1681
-EBUILD depth_image_proc-1.12.23.ebuild 732 BLAKE2B a5ab72714539b5c587ede8dd2a791e45f8016fe934765bb0132555b78ece1174351ef31b1bfed432eda62d5c85e1094bba244a8e3622dcd5487a2956e08fc58c SHA512 87982442ec87ce04625e18f3df7256aceb7fc85130319aebd490e920a144e53370e1dee481d4233d4cbace5477de29dfd12456df7bd33ca18c312abf387a06ea
-EBUILD depth_image_proc-1.13.0.ebuild 729 BLAKE2B 2ed998c7d9bd47c6001459c29bce85d83935ef7896842cfb401879c37f54a46667f3461ff72aad04e4957b094c5b4e4117a09f5cc1250782decb81c527b8f1ae SHA512 a7cd7baf56694ce74e0ff2248ecc49b6c1b7e26614c45961a9c4fdde965565f95a6b8c7e72da7c3c4cfe3acfca7e653efd19a27877b9466306dfd3e9c0e25ad9
-EBUILD depth_image_proc-9999.ebuild 732 BLAKE2B 16cf7f434921ef6754dee1ef95da566b2a13267c9b51f6d8da7515e36e8696da505e1a43650c0536595e0ab12912b7176ad4f0aecaaaf6bd77c9fd957c28f28c SHA512 c81f37aacce8a8ea5a41d735e6411d8a03b8ae834ee76ffc54dffc46296c7afae845cbfadae49bc189d9438e81569bab82eb2e4d0e193bc836e8b47e079e1681
+DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
+EBUILD depth_image_proc-1.15.2.ebuild 730 BLAKE2B 3482014f0562d3a1ffe9ea79d603afd968c3b111a976413718fea27465e35226e3abc23922fb3224938fd047dd2d6564798171329195de8082b7e95750f6303c SHA512 48717a00873856350bc0002e9b76d4f1a077bde06653331e54c99de80772532899e0c656a149d4762ef699c519b4e59bac5539d8921a29d946cd39f6598c454c
+EBUILD depth_image_proc-9999.ebuild 730 BLAKE2B 3482014f0562d3a1ffe9ea79d603afd968c3b111a976413718fea27465e35226e3abc23922fb3224938fd047dd2d6564798171329195de8082b7e95750f6303c SHA512 48717a00873856350bc0002e9b76d4f1a077bde06653331e54c99de80772532899e0c656a149d4762ef699c519b4e59bac5539d8921a29d946cd39f6598c454c
MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.12.22-r1.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.12.22-r1.ebuild
deleted file mode 100644
index 65c78ae415a8..000000000000
--- a/dev-ros/depth_image_proc/depth_image_proc-1.12.22-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- media-libs/opencv:=
- dev-ros/eigen_conversions
- dev-ros/image_geometry
- dev-ros/image_transport
- dev-ros/message_filters
- dev-ros/nodelet
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf2
- dev-ros/tf2_ros
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.12.23.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.12.23.ebuild
deleted file mode 100644
index 85a496111029..000000000000
--- a/dev-ros/depth_image_proc/depth_image_proc-1.12.23.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- media-libs/opencv:=
- dev-ros/eigen_conversions
- dev-ros/image_geometry
- dev-ros/image_transport
- dev-ros/message_filters
- dev-ros/nodelet
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf2
- dev-ros/tf2_ros
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.13.0.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.13.0.ebuild
deleted file mode 100644
index 6037fd6b4bca..000000000000
--- a/dev-ros/depth_image_proc/depth_image_proc-1.13.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- media-libs/opencv:=
- dev-ros/eigen_conversions
- dev-ros/image_geometry
- dev-ros/image_transport
- dev-ros/message_filters
- dev-ros/nodelet
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf2
- dev-ros/tf2_ros
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.15.2.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.15.2.ebuild
new file mode 100644
index 000000000000..4cbfec1b77ae
--- /dev/null
+++ b/dev-ros/depth_image_proc/depth_image_proc-1.15.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge
+ media-libs/opencv:=
+ dev-ros/eigen_conversions
+ dev-ros/image_geometry
+ dev-ros/image_transport
+ dev-ros/message_filters
+ dev-ros/nodelet
+ dev-ros/tf2
+ dev-ros/tf2_ros
+ dev-libs/boost:=
+ dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/depth_image_proc/depth_image_proc-9999.ebuild b/dev-ros/depth_image_proc/depth_image_proc-9999.ebuild
index 65c78ae415a8..4cbfec1b77ae 100644
--- a/dev-ros/depth_image_proc/depth_image_proc-9999.ebuild
+++ b/dev-ros/depth_image_proc/depth_image_proc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
@@ -21,11 +21,12 @@ RDEPEND="
dev-ros/image_transport
dev-ros/message_filters
dev-ros/nodelet
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/tf2
dev-ros/tf2_ros
dev-libs/boost:=
dev-libs/console_bridge:=
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/diagnostic_aggregator/Manifest b/dev-ros/diagnostic_aggregator/Manifest
index 95dcbd7e82a4..e791f568d631 100644
--- a/dev-ros/diagnostic_aggregator/Manifest
+++ b/dev-ros/diagnostic_aggregator/Manifest
@@ -1,6 +1,4 @@
-DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
-DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
-EBUILD diagnostic_aggregator-1.9.2-r1.ebuild 583 BLAKE2B bd9ec81e5f2d2fe41ee77bab6072bd87e7e4fd749471ac5d9672fd866df215fda5eaf6fe8f775717dc94144eccfd4e4b74a2aecd0edca252d385d45c64467c7d SHA512 77b3f633a06959a282f69aa0d73951fc5b83ceb85f2bfcce8b9f0a31f8130b7fa2e8fc4d4a546c1b009be21d3e39d165dafc537f386a25afb4e8a6b8df525845
-EBUILD diagnostic_aggregator-1.9.3.ebuild 583 BLAKE2B ab074a4b081d313ebdfd1744d030050e90c16aab4c9b37ed3efc9b6d9ad46eed3f5a4a5ca2b9fc244e5d86ee0ff6ae2f0fa7610b661855bc019d4a474adea7fb SHA512 e5953c56c3c8d1d786c5adcd07c19646ac21f66250196cf35cc76b38a8d15b417c1e374d0a8e65ad371e74c9946a9463d519f94f7b909e0be3260a1765a97c77
-EBUILD diagnostic_aggregator-9999.ebuild 583 BLAKE2B bd9ec81e5f2d2fe41ee77bab6072bd87e7e4fd749471ac5d9672fd866df215fda5eaf6fe8f775717dc94144eccfd4e4b74a2aecd0edca252d385d45c64467c7d SHA512 77b3f633a06959a282f69aa0d73951fc5b83ceb85f2bfcce8b9f0a31f8130b7fa2e8fc4d4a546c1b009be21d3e39d165dafc537f386a25afb4e8a6b8df525845
+DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
+EBUILD diagnostic_aggregator-1.9.4.ebuild 580 BLAKE2B 4a9187acf40b268408e2cfa2ef61aefb1cba61a4906f3d1737bc5edcc344f65fd6b80e432ea8d0c1ae1f633a85a1619dfb59ffd4cd574fb0a39c9ba86cc6db71 SHA512 ae2041f130d9255f91ce8f1a65c8f6b84ce63a372dc4ac6cc446dfa9ce7cf8c8ad0b3f40e4946ef71a8b716372c804694afe6c475bbf0c914d372c58a435f22e
+EBUILD diagnostic_aggregator-9999.ebuild 580 BLAKE2B 4a9187acf40b268408e2cfa2ef61aefb1cba61a4906f3d1737bc5edcc344f65fd6b80e432ea8d0c1ae1f633a85a1619dfb59ffd4cd574fb0a39c9ba86cc6db71 SHA512 ae2041f130d9255f91ce8f1a65c8f6b84ce63a372dc4ac6cc446dfa9ce7cf8c8ad0b3f40e4946ef71a8b716372c804694afe6c475bbf0c914d372c58a435f22e
MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.2-r1.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.2-r1.ebuild
deleted file mode 100644
index 7a610fadd9fb..000000000000
--- a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates ROS diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/pluginlib
- dev-libs/tinyxml2:=
- dev-ros/roscpp
- dev-ros/rospy
- dev-ros/rostest
- dev-ros/xmlrpcpp
- dev-ros/bondcpp
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest )"
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.3.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.3.ebuild
deleted file mode 100644
index 650ad537d33a..000000000000
--- a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates ROS diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/pluginlib
- dev-libs/tinyxml2:=
- dev-ros/roscpp
- dev-ros/rospy
- dev-ros/rostest
- dev-ros/xmlrpcpp
- dev-ros/bondcpp
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest )"
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.4.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.4.ebuild
new file mode 100644
index 000000000000..345bf6055e76
--- /dev/null
+++ b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Aggregates ROS diagnostics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/pluginlib
+ dev-libs/tinyxml2:=
+ dev-ros/roscpp
+ dev-ros/rospy
+ dev-ros/rostest
+ dev-ros/xmlrpcpp
+ dev-ros/bondcpp
+ dev-libs/boost:=
+ dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ test? ( dev-ros/rostest )"
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-9999.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-9999.ebuild
index 7a610fadd9fb..345bf6055e76 100644
--- a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-9999.ebuild
+++ b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/diagnostics"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
@@ -14,7 +14,6 @@ SLOT="0"
IUSE=""
RDEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/pluginlib
dev-libs/tinyxml2:=
dev-ros/roscpp
@@ -26,4 +25,5 @@ RDEPEND="
dev-libs/console_bridge:=
"
DEPEND="${RDEPEND}
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? ( dev-ros/rostest )"
diff --git a/dev-ros/diagnostic_analysis/Manifest b/dev-ros/diagnostic_analysis/Manifest
index 2a27aa0f821c..e4b1faa07b31 100644
--- a/dev-ros/diagnostic_analysis/Manifest
+++ b/dev-ros/diagnostic_analysis/Manifest
@@ -1,14 +1,4 @@
-DIST diagnostics-1.8.10.tar.gz 525999 BLAKE2B 97d28f89c01fb8ee17fda9b0207f68848c57af754980562dce05d9eb76b1505f316ef64fe06a8a76db807d0b6d39657924e0f5c9dd8372a1df2fbefd51cacd8c SHA512 a3719b1cb745e376bbff55c483c92916588b4548c0c7b57cad299d3b748ca278a2d6b1a874168dd489b60a6dbc2250b40db1c55b54a4043de1b5c3ce3c8a5513
-DIST diagnostics-1.8.8.tar.gz 508404 BLAKE2B 9bf90d268ac23d0007133ddc5f2ac0d6ba445265b9cde19271d43274316af3ce734947a1a8a6226491c59e142a36e9f547edb996c797fec6ecaf143afa2c7363 SHA512 f0e59442cf4cd277c1ef77e7bceec973a15519c9d81bbde21851592ba52c4c7d55a6358c6a65004490b3e3822a6edc772f20e41992a2b3604d9e64e9fd7124ef
-DIST diagnostics-1.8.9.tar.gz 525881 BLAKE2B 6de75f5fa961da199daab1a6ae1c2b34b0edbd70c09e58f7384c76f9dd0c3a51cc8b0f20688dbdcafe164ade3a0e3bdc894064cc269f6b8fb0e31faa6f4d9654 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80
-DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
-DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
-DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
-EBUILD diagnostic_analysis-1.8.10.ebuild 592 BLAKE2B 90fe81e38d40b8034946430666ba449e391fa9bee6b794774db68c87962bb913e004f6d67add27b01b973155c6af35a05de71f1e5cce0b9e7c0c01f9202bdf8c SHA512 6d1d6a956973c20eed5f491c68c71dc45d4e0260c70165b8fde6a6b1a9349a60dcd00cf618e7dff457b0a00b42d062dea0ec67fcd3c7149981e43c8c4afb3453
-EBUILD diagnostic_analysis-1.8.8.ebuild 592 BLAKE2B 14c3b84ef2fa6763085a75a06ae72ba6e33a87dc9b9a41aeec2063f6d23d58a8ef5ad07da489c0565e8d815041f4de00a82f25789cf9eb5ecca2a0a749fcd2c8 SHA512 ce590b7a3a4c834e7bbd68043e42342214e5337c74de458306c03c4a5c655f7cb9d466e1c4a5b9c1a2cc39f8b56990511ef141abd162300645a0ac52e8933677
-EBUILD diagnostic_analysis-1.8.9.ebuild 592 BLAKE2B 14c3b84ef2fa6763085a75a06ae72ba6e33a87dc9b9a41aeec2063f6d23d58a8ef5ad07da489c0565e8d815041f4de00a82f25789cf9eb5ecca2a0a749fcd2c8 SHA512 ce590b7a3a4c834e7bbd68043e42342214e5337c74de458306c03c4a5c655f7cb9d466e1c4a5b9c1a2cc39f8b56990511ef141abd162300645a0ac52e8933677
-EBUILD diagnostic_analysis-1.9.0.ebuild 592 BLAKE2B 91fb793da96827276f7219f1396ca4e3b174e853a5e18fdbea5e54a1ca06782470d4b45424ff81a5811e01d74d1987d009bc42325b6753043bb1285b911b4900 SHA512 097d5dcb4564e0e33bf8813e385a802d943d873528468064d6ae1adc1578b8f6b684e34906d2dbd6be801a9bacbe83baf1ddb3069f27c3a9bb219f501bdaa720
-EBUILD diagnostic_analysis-1.9.2.ebuild 592 BLAKE2B 91fb793da96827276f7219f1396ca4e3b174e853a5e18fdbea5e54a1ca06782470d4b45424ff81a5811e01d74d1987d009bc42325b6753043bb1285b911b4900 SHA512 097d5dcb4564e0e33bf8813e385a802d943d873528468064d6ae1adc1578b8f6b684e34906d2dbd6be801a9bacbe83baf1ddb3069f27c3a9bb219f501bdaa720
-EBUILD diagnostic_analysis-1.9.3.ebuild 592 BLAKE2B ec4aa558c8281f2641f62093d568569f66addaf50b1dd2378a9e1f634da6e85c9ef5699ab6f58113497bcc1ac11cd75839c4546a49080b9438dd885468933780 SHA512 c1ff79ca45ca2c7db39aa55147b4c19bab2f0c085f79710e81704c0bc18c455a425ff60454314009e31d87c89bad897e7ed0246b75be3f530cb0c8a8555c18f9
-EBUILD diagnostic_analysis-9999.ebuild 592 BLAKE2B 14c3b84ef2fa6763085a75a06ae72ba6e33a87dc9b9a41aeec2063f6d23d58a8ef5ad07da489c0565e8d815041f4de00a82f25789cf9eb5ecca2a0a749fcd2c8 SHA512 ce590b7a3a4c834e7bbd68043e42342214e5337c74de458306c03c4a5c655f7cb9d466e1c4a5b9c1a2cc39f8b56990511ef141abd162300645a0ac52e8933677
+DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
+EBUILD diagnostic_analysis-1.9.4.ebuild 561 BLAKE2B 04302bade7b4b816a3b0a4787dd11db75965ec17081c9b203cc5c0a483f3eaf0c72ad595e75a089cd9328dde3fd8aa8f504c1703aa43d593e43bda2a00b3b365 SHA512 4afb4ea0ed3d68bbe37780ce354f8d77818077d1c0d5123c1095bc5a3786a80ab27a1d62719f39239780fd6731d31e298ae3b4aeab120ed0fd884fb5a9158d27
+EBUILD diagnostic_analysis-9999.ebuild 561 BLAKE2B 04302bade7b4b816a3b0a4787dd11db75965ec17081c9b203cc5c0a483f3eaf0c72ad595e75a089cd9328dde3fd8aa8f504c1703aa43d593e43bda2a00b3b365 SHA512 4afb4ea0ed3d68bbe37780ce354f8d77818077d1c0d5123c1095bc5a3786a80ab27a1d62719f39239780fd6731d31e298ae3b4aeab120ed0fd884fb5a9158d27
MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.10.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.10.ebuild
deleted file mode 100644
index dc238916c796..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Converts diagnostics data into a series of CSV files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.8.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.8.ebuild
deleted file mode 100644
index f300b602d629..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Converts diagnostics data into a series of CSV files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.9.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.9.ebuild
deleted file mode 100644
index f300b602d629..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Converts diagnostics data into a series of CSV files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.0.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.0.ebuild
deleted file mode 100644
index b2b767204efd..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Converts diagnostics data into a series of CSV files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.2.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.2.ebuild
deleted file mode 100644
index b2b767204efd..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Converts diagnostics data into a series of CSV files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.3.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.3.ebuild
deleted file mode 100644
index 7e9226fd5c37..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Converts diagnostics data into a series of CSV files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.4.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.4.ebuild
new file mode 100644
index 000000000000..bf479c375c49
--- /dev/null
+++ b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Converts diagnostics data into a series of CSV files"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-ros/rosbag[${PYTHON_USEDEP}]
+ dev-ros/rostest[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-9999.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-9999.ebuild
index f300b602d629..bf479c375c49 100644
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-9999.ebuild
+++ b/dev-ros/diagnostic_analysis/diagnostic_analysis-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/diagnostics"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/diagnostic_common_diagnostics/Manifest b/dev-ros/diagnostic_common_diagnostics/Manifest
index e29b32c0b3a8..51c1ce84c10b 100644
--- a/dev-ros/diagnostic_common_diagnostics/Manifest
+++ b/dev-ros/diagnostic_common_diagnostics/Manifest
@@ -1,14 +1,4 @@
-DIST diagnostics-1.8.10.tar.gz 525999 BLAKE2B 97d28f89c01fb8ee17fda9b0207f68848c57af754980562dce05d9eb76b1505f316ef64fe06a8a76db807d0b6d39657924e0f5c9dd8372a1df2fbefd51cacd8c SHA512 a3719b1cb745e376bbff55c483c92916588b4548c0c7b57cad299d3b748ca278a2d6b1a874168dd489b60a6dbc2250b40db1c55b54a4043de1b5c3ce3c8a5513
-DIST diagnostics-1.8.8.tar.gz 508404 BLAKE2B 9bf90d268ac23d0007133ddc5f2ac0d6ba445265b9cde19271d43274316af3ce734947a1a8a6226491c59e142a36e9f547edb996c797fec6ecaf143afa2c7363 SHA512 f0e59442cf4cd277c1ef77e7bceec973a15519c9d81bbde21851592ba52c4c7d55a6358c6a65004490b3e3822a6edc772f20e41992a2b3604d9e64e9fd7124ef
-DIST diagnostics-1.8.9.tar.gz 525881 BLAKE2B 6de75f5fa961da199daab1a6ae1c2b34b0edbd70c09e58f7384c76f9dd0c3a51cc8b0f20688dbdcafe164ade3a0e3bdc894064cc269f6b8fb0e31faa6f4d9654 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80
-DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
-DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
-DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
-EBUILD diagnostic_common_diagnostics-1.8.10.ebuild 535 BLAKE2B 50ff4a1d1d47927f267fd691e07c7806a8533b4ebcdf28ce2e014120b2bb0f5a7fe48a01526931e3d737c6a303a3844432def31405e6c51bc816cf887141875c SHA512 a32446e9b4c89170a6d8fe302d7bce35f43c69a6db3044a5c45800335275598cccd6361a11aa5db1eef40bddf43be24bd7cfc5dc88e22079abf923e2b2dffded
-EBUILD diagnostic_common_diagnostics-1.8.8.ebuild 535 BLAKE2B 29329eb9e0e7a8d8535177bc8cb80df513bb659e3615cf82b7d093c2b3cbb46a45ccb524ce1ff0adf7daab505ed5e8b429f3b624b4027d3fa75a8f119b55f513 SHA512 be114573e99cb90e9f3002747250ae6658ed00676e95290756950d5be712ef3e6514909c26e78683f875ccba102b58618bc3d2c868f7cf1108c7723c6d85f7c8
-EBUILD diagnostic_common_diagnostics-1.8.9.ebuild 535 BLAKE2B 29329eb9e0e7a8d8535177bc8cb80df513bb659e3615cf82b7d093c2b3cbb46a45ccb524ce1ff0adf7daab505ed5e8b429f3b624b4027d3fa75a8f119b55f513 SHA512 be114573e99cb90e9f3002747250ae6658ed00676e95290756950d5be712ef3e6514909c26e78683f875ccba102b58618bc3d2c868f7cf1108c7723c6d85f7c8
-EBUILD diagnostic_common_diagnostics-1.9.0.ebuild 535 BLAKE2B 2da998bc10c2334c000f658abdc86e2491cb224bc2e0fde1f6a05cd213be8636d99b5c80c391acb378eeefd35e70fc8c4d5ef9bc5fcbdd9f8126063ccb044234 SHA512 0b4ff0ce595287096da6d23d6f20d12f6a1fa01b978512d92aff859753497c2732fcd741d495dda3555375e409cc95284e7be25342fcf33671a20a45b030472b
-EBUILD diagnostic_common_diagnostics-1.9.2.ebuild 535 BLAKE2B 2da998bc10c2334c000f658abdc86e2491cb224bc2e0fde1f6a05cd213be8636d99b5c80c391acb378eeefd35e70fc8c4d5ef9bc5fcbdd9f8126063ccb044234 SHA512 0b4ff0ce595287096da6d23d6f20d12f6a1fa01b978512d92aff859753497c2732fcd741d495dda3555375e409cc95284e7be25342fcf33671a20a45b030472b
-EBUILD diagnostic_common_diagnostics-1.9.3.ebuild 535 BLAKE2B 4e308b6d8baf51618a63dadb3c06b889d8394d6245848df535ad177f03f838cca8f4ffb3a55072ee113d2910e98b78fd8f53056eb3884e9fc80a0382914738dd SHA512 87eafa4ab1038fe053db4855de5d90bc7e5c6a6e955d20ce4d1cc90ce88e0ac151599f96f8bd6f6796adfa749833ea25e3a2f5830160b76605db2d3ee97f35ed
-EBUILD diagnostic_common_diagnostics-9999.ebuild 535 BLAKE2B 29329eb9e0e7a8d8535177bc8cb80df513bb659e3615cf82b7d093c2b3cbb46a45ccb524ce1ff0adf7daab505ed5e8b429f3b624b4027d3fa75a8f119b55f513 SHA512 be114573e99cb90e9f3002747250ae6658ed00676e95290756950d5be712ef3e6514909c26e78683f875ccba102b58618bc3d2c868f7cf1108c7723c6d85f7c8
+DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
+EBUILD diagnostic_common_diagnostics-1.9.4.ebuild 504 BLAKE2B 27599b5c26612bb734182f324bb03b6a1ae96aa9cfdac38eb09f413241289fb9901a7cd9aeb92ea0f786d04928e947ad91513c1fdd37f2ffd7c491f5a416b47f SHA512 479bf388513175a17a9c20eb9733d51c4eba44b44e5e5a6c0e767073e69b93b5e273de4b956210aacbe7ed2b2238f86e82f202caf90415e43bea23253e2f0866
+EBUILD diagnostic_common_diagnostics-9999.ebuild 504 BLAKE2B 27599b5c26612bb734182f324bb03b6a1ae96aa9cfdac38eb09f413241289fb9901a7cd9aeb92ea0f786d04928e947ad91513c1fdd37f2ffd7c491f5a416b47f SHA512 479bf388513175a17a9c20eb9733d51c4eba44b44e5e5a6c0e767073e69b93b5e273de4b956210aacbe7ed2b2238f86e82f202caf90415e43bea23253e2f0866
MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.10.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.10.ebuild
deleted file mode 100644
index 9f8282baad72..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
- app-admin/hddtemp"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.8.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.8.ebuild
deleted file mode 100644
index 4e399a800340..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
- app-admin/hddtemp"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.9.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.9.ebuild
deleted file mode 100644
index 4e399a800340..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
- app-admin/hddtemp"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.0.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.0.ebuild
deleted file mode 100644
index 49c81e178a94..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
- app-admin/hddtemp"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.2.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.2.ebuild
deleted file mode 100644
index 49c81e178a94..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
- app-admin/hddtemp"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.3.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.3.ebuild
deleted file mode 100644
index f34ad33f0501..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
- app-admin/hddtemp"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.4.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.4.ebuild
new file mode 100644
index 000000000000..70bdfc846a27
--- /dev/null
+++ b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Generic nodes for monitoring a linux host"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+ app-admin/hddtemp"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-9999.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-9999.ebuild
index 4e399a800340..70bdfc846a27 100644
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-9999.ebuild
+++ b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/diagnostics"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/diagnostic_msgs/Manifest b/dev-ros/diagnostic_msgs/Manifest
index e2bb7d4683b8..d4051cf3dd31 100644
--- a/dev-ros/diagnostic_msgs/Manifest
+++ b/dev-ros/diagnostic_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-EBUILD diagnostic_msgs-1.12.5.ebuild 495 BLAKE2B f6415f305dd30050a7d7626340f8aa826f20fc1aafa2356a2b766d4b135308f8fb86bc4400792a999e249954b8b09f62f60f1456556d8dc70c8ae6d3b7b13114 SHA512 b28d1229b33fcdd6de947b2c93ef70efe592d1aeaeb6133fc3a8e0de006bba0f0a79901212d4d712a9ef89fe92faf4af6f8bebecd39a9ed1e85f5469e966131f
-EBUILD diagnostic_msgs-1.12.6.ebuild 495 BLAKE2B f6415f305dd30050a7d7626340f8aa826f20fc1aafa2356a2b766d4b135308f8fb86bc4400792a999e249954b8b09f62f60f1456556d8dc70c8ae6d3b7b13114 SHA512 b28d1229b33fcdd6de947b2c93ef70efe592d1aeaeb6133fc3a8e0de006bba0f0a79901212d4d712a9ef89fe92faf4af6f8bebecd39a9ed1e85f5469e966131f
-EBUILD diagnostic_msgs-1.12.7.ebuild 495 BLAKE2B f6415f305dd30050a7d7626340f8aa826f20fc1aafa2356a2b766d4b135308f8fb86bc4400792a999e249954b8b09f62f60f1456556d8dc70c8ae6d3b7b13114 SHA512 b28d1229b33fcdd6de947b2c93ef70efe592d1aeaeb6133fc3a8e0de006bba0f0a79901212d4d712a9ef89fe92faf4af6f8bebecd39a9ed1e85f5469e966131f
-EBUILD diagnostic_msgs-9999.ebuild 495 BLAKE2B f6415f305dd30050a7d7626340f8aa826f20fc1aafa2356a2b766d4b135308f8fb86bc4400792a999e249954b8b09f62f60f1456556d8dc70c8ae6d3b7b13114 SHA512 b28d1229b33fcdd6de947b2c93ef70efe592d1aeaeb6133fc3a8e0de006bba0f0a79901212d4d712a9ef89fe92faf4af6f8bebecd39a9ed1e85f5469e966131f
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
+EBUILD diagnostic_msgs-1.13.0.ebuild 455 BLAKE2B ad3b54387c724d20c5e19aea39fb995eed5c4bfce202e79482dbb12fee0e870a225242718fbf0b5a2ee3c71f3cace17b2c29e7053aeb4c5f37e492b71dd3e0ae SHA512 0c69cb5ae42c5196a3a23b09a4d8a5afdf368415e734def1c1ee5e4fd2565bd495efd0fba915198cbc44ec95313b0fe9f6b508b3177e01f2db23f2c588e6acc9
+EBUILD diagnostic_msgs-9999.ebuild 455 BLAKE2B ad3b54387c724d20c5e19aea39fb995eed5c4bfce202e79482dbb12fee0e870a225242718fbf0b5a2ee3c71f3cace17b2c29e7053aeb4c5f37e492b71dd3e0ae SHA512 0c69cb5ae42c5196a3a23b09a4d8a5afdf368415e734def1c1ee5e4fd2565bd495efd0fba915198cbc44ec95313b0fe9f6b508b3177e01f2db23f2c588e6acc9
MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.5.ebuild b/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.5.ebuild
deleted file mode 100644
index d7e1dd47b266..000000000000
--- a/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Standardized interface for the diagnostic and runtime monitoring systems in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.6.ebuild b/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.6.ebuild
deleted file mode 100644
index d7e1dd47b266..000000000000
--- a/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Standardized interface for the diagnostic and runtime monitoring systems in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.7.ebuild b/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.7.ebuild
deleted file mode 100644
index d7e1dd47b266..000000000000
--- a/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Standardized interface for the diagnostic and runtime monitoring systems in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/diagnostic_msgs/diagnostic_msgs-1.13.0.ebuild b/dev-ros/diagnostic_msgs/diagnostic_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..8dca48c249b7
--- /dev/null
+++ b/dev-ros/diagnostic_msgs/diagnostic_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Standardized interface for the diagnostic and runtime monitoring systems in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/diagnostic_msgs/diagnostic_msgs-9999.ebuild b/dev-ros/diagnostic_msgs/diagnostic_msgs-9999.ebuild
index d7e1dd47b266..8dca48c249b7 100644
--- a/dev-ros/diagnostic_msgs/diagnostic_msgs-9999.ebuild
+++ b/dev-ros/diagnostic_msgs/diagnostic_msgs-9999.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/common_msgs"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
diff --git a/dev-ros/diagnostic_updater/Manifest b/dev-ros/diagnostic_updater/Manifest
index 047086620e6a..0d1e83dd3c08 100644
--- a/dev-ros/diagnostic_updater/Manifest
+++ b/dev-ros/diagnostic_updater/Manifest
@@ -1,14 +1,4 @@
-DIST diagnostics-1.8.10.tar.gz 525999 BLAKE2B 97d28f89c01fb8ee17fda9b0207f68848c57af754980562dce05d9eb76b1505f316ef64fe06a8a76db807d0b6d39657924e0f5c9dd8372a1df2fbefd51cacd8c SHA512 a3719b1cb745e376bbff55c483c92916588b4548c0c7b57cad299d3b748ca278a2d6b1a874168dd489b60a6dbc2250b40db1c55b54a4043de1b5c3ce3c8a5513
-DIST diagnostics-1.8.8.tar.gz 508404 BLAKE2B 9bf90d268ac23d0007133ddc5f2ac0d6ba445265b9cde19271d43274316af3ce734947a1a8a6226491c59e142a36e9f547edb996c797fec6ecaf143afa2c7363 SHA512 f0e59442cf4cd277c1ef77e7bceec973a15519c9d81bbde21851592ba52c4c7d55a6358c6a65004490b3e3822a6edc772f20e41992a2b3604d9e64e9fd7124ef
-DIST diagnostics-1.8.9.tar.gz 525881 BLAKE2B 6de75f5fa961da199daab1a6ae1c2b34b0edbd70c09e58f7384c76f9dd0c3a51cc8b0f20688dbdcafe164ade3a0e3bdc894064cc269f6b8fb0e31faa6f4d9654 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80
-DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
-DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
-DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
-EBUILD diagnostic_updater-1.8.10.ebuild 680 BLAKE2B e6874d6ee6169653d3f115e82a4191056a4113f767de94bff254ed7ccd96b70452fd4e91da5e20101f0a342dc99bd1485ee92a8c05a3ce3d1780377a2e4b40e2 SHA512 1232f52186e5ba463f6b92399881a92c0f70affbe532901719a6d361dd5024afc3b7c46d3d8236490bfe5bace2e7ddb292f0a1f9b9af5f32bf4da4671c8dc7aa
-EBUILD diagnostic_updater-1.8.8.ebuild 680 BLAKE2B 9e144541f453c8f1947234290709bd3d49d9b6a055b07b843fd86b1c7df8d4d772371ab888c4216048ab399ac032ba979ad4d825f3f133e572ede6e760160164 SHA512 14dc098b31508d430e63d429d88e6289de31c7d230e18614715c084d1ec787da3149290bf19c30d705da2c3bbe505c4c10092fae84319ea4feacec8920b371f7
-EBUILD diagnostic_updater-1.8.9.ebuild 680 BLAKE2B 9e144541f453c8f1947234290709bd3d49d9b6a055b07b843fd86b1c7df8d4d772371ab888c4216048ab399ac032ba979ad4d825f3f133e572ede6e760160164 SHA512 14dc098b31508d430e63d429d88e6289de31c7d230e18614715c084d1ec787da3149290bf19c30d705da2c3bbe505c4c10092fae84319ea4feacec8920b371f7
-EBUILD diagnostic_updater-1.9.0.ebuild 680 BLAKE2B dcdecb3b088fe7dd17cb5242d32158dfbffea204f0aa2148ec88cb0e7a6a5c5655ff67bfabdceabb82e570450154821c860dae2b22ba8db7ab59c78be9566aa6 SHA512 3d09548ad40f64f6aeedec3174cd8a114e12854e57c281a1e60cdff7ca8afdaa45f0a31c361e1bcb1e16108bf715ec2155ef2f13abd8125d8bd9ef73798d553e
-EBUILD diagnostic_updater-1.9.2.ebuild 680 BLAKE2B dcdecb3b088fe7dd17cb5242d32158dfbffea204f0aa2148ec88cb0e7a6a5c5655ff67bfabdceabb82e570450154821c860dae2b22ba8db7ab59c78be9566aa6 SHA512 3d09548ad40f64f6aeedec3174cd8a114e12854e57c281a1e60cdff7ca8afdaa45f0a31c361e1bcb1e16108bf715ec2155ef2f13abd8125d8bd9ef73798d553e
-EBUILD diagnostic_updater-1.9.3.ebuild 680 BLAKE2B f9d773983076c3887feb9102b5816299a0f245a8f992bbeaf8c5453cbcc34a9a10d0690dbd049e2898975d748e4326d7b48421b2a9b293c1945e4a0028908ce5 SHA512 410dc6493a54450821ec083d98e55c8e9587b3df0298c5f3391a6ad86e66f1ecd7a64c59e0d34efd97d30ad3298f6e45b1e9260327b308cf01d47df3893ec0cc
-EBUILD diagnostic_updater-9999.ebuild 680 BLAKE2B 9e144541f453c8f1947234290709bd3d49d9b6a055b07b843fd86b1c7df8d4d772371ab888c4216048ab399ac032ba979ad4d825f3f133e572ede6e760160164 SHA512 14dc098b31508d430e63d429d88e6289de31c7d230e18614715c084d1ec787da3149290bf19c30d705da2c3bbe505c4c10092fae84319ea4feacec8920b371f7
+DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
+EBUILD diagnostic_updater-1.9.4.ebuild 694 BLAKE2B cf294ce9c927f6c613b9e2d1128fc7122a57773e5c5e74363f236e0c1abb8b1119f33d5a1cfd1419627a38baa7eea159a6455dd5531eb4ebffb6883c07665fed SHA512 a91e146148a113d2687e1f72c0776ae999f44bdf3eab5bd55b46ccd5c16f89450647a847d02108b454a1310e03ac890e26270f901fed8495f9823d8c6a93776e
+EBUILD diagnostic_updater-9999.ebuild 694 BLAKE2B cf294ce9c927f6c613b9e2d1128fc7122a57773e5c5e74363f236e0c1abb8b1119f33d5a1cfd1419627a38baa7eea159a6455dd5531eb4ebffb6883c07665fed SHA512 a91e146148a113d2687e1f72c0776ae999f44bdf3eab5bd55b46ccd5c16f89450647a847d02108b454a1310e03ac890e26270f901fed8495f9823d8c6a93776e
MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.8.10.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.8.10.ebuild
deleted file mode 100644
index 1168d92b85c7..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.8.10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.8.8.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.8.8.ebuild
deleted file mode 100644
index 11ea335900e4..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.8.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.8.9.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.8.9.ebuild
deleted file mode 100644
index 11ea335900e4..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.8.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.0.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.9.0.ebuild
deleted file mode 100644
index f4bd878c1610..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.2.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.9.2.ebuild
deleted file mode 100644
index f4bd878c1610..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.3.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.9.3.ebuild
deleted file mode 100644
index 961c2bf53258..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.4.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.9.4.ebuild
new file mode 100644
index 000000000000..ca0ceb79a286
--- /dev/null
+++ b/dev-ros/diagnostic_updater/diagnostic_updater-1.9.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for updating diagnostics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/roscpp
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-ros/std_msgs[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-9999.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-9999.ebuild
index 11ea335900e4..ca0ceb79a286 100644
--- a/dev-ros/diagnostic_updater/diagnostic_updater-9999.ebuild
+++ b/dev-ros/diagnostic_updater/diagnostic_updater-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/diagnostics"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -15,11 +14,13 @@ SLOT="0"
IUSE=""
RDEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
dev-ros/roscpp
dev-ros/rostest[${PYTHON_USEDEP}]
dev-ros/std_msgs[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/eigen_conversions/Manifest b/dev-ros/eigen_conversions/Manifest
index a1d41140e706..f48348e64ebb 100644
--- a/dev-ros/eigen_conversions/Manifest
+++ b/dev-ros/eigen_conversions/Manifest
@@ -1,6 +1,4 @@
-DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
-DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
-EBUILD eigen_conversions-1.11.9-r1.ebuild 562 BLAKE2B bae7a80955e2140b3e6845e1be8203cd24690c81ff157095847952e9d3ddd88888ddd540d0e2ec26af3e9c4f57f90c37df00b706a625237c604dbf59430b3307 SHA512 8c19ba235c637de3f3a835143b7920370052e78d763151d1d572aaa85a78c512e82b0a54dd059ba6bfa2e7ca04496c7b5e2fb602b85335e0169b473c3f0db3c1
-EBUILD eigen_conversions-1.12.0.ebuild 562 BLAKE2B bae7a80955e2140b3e6845e1be8203cd24690c81ff157095847952e9d3ddd88888ddd540d0e2ec26af3e9c4f57f90c37df00b706a625237c604dbf59430b3307 SHA512 8c19ba235c637de3f3a835143b7920370052e78d763151d1d572aaa85a78c512e82b0a54dd059ba6bfa2e7ca04496c7b5e2fb602b85335e0169b473c3f0db3c1
-EBUILD eigen_conversions-9999.ebuild 562 BLAKE2B bae7a80955e2140b3e6845e1be8203cd24690c81ff157095847952e9d3ddd88888ddd540d0e2ec26af3e9c4f57f90c37df00b706a625237c604dbf59430b3307 SHA512 8c19ba235c637de3f3a835143b7920370052e78d763151d1d572aaa85a78c512e82b0a54dd059ba6bfa2e7ca04496c7b5e2fb602b85335e0169b473c3f0db3c1
+DIST geometry-1.13.2.tar.gz 188225 BLAKE2B b08e78b298c94c38baa5d25a878be703d7d3a310277b66690b9fe4da1d0cd3f9083cf3bf6dc1d59149599b6fb0ec10feaf668206da245ed7e0cb9cf1878b620c SHA512 504de0e7ebf1dd73e918ab4fa39967cc9e39a53d487072430106b391d669ddfc7e530b66b38f4f73d1787e4a73acdad8e707c6757afe2e235157d4aa19f28af2
+EBUILD eigen_conversions-1.13.2.ebuild 560 BLAKE2B baf19aaaa0bd264c55b6a759a982c409c7e0a33c97e8292b4135592a996edd8c4d4c1228d348549f18cfdfed8d1c98a7a7d1f90a5bcd6e07c71378433b85d13e SHA512 fcd62b46d9a3657ea9513babe27b42984067247a0d217b0ef2f8ff7a8a4e30e86c4240417c3ac6cfaafdfc52dfc18bad42d7fd9e4741d9069a6937c86ad1c9ff
+EBUILD eigen_conversions-9999.ebuild 560 BLAKE2B baf19aaaa0bd264c55b6a759a982c409c7e0a33c97e8292b4135592a996edd8c4d4c1228d348549f18cfdfed8d1c98a7a7d1f90a5bcd6e07c71378433b85d13e SHA512 fcd62b46d9a3657ea9513babe27b42984067247a0d217b0ef2f8ff7a8a4e30e86c4240417c3ac6cfaafdfc52dfc18bad42d7fd9e4741d9069a6937c86ad1c9ff
MISC metadata.xml 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/eigen_conversions/eigen_conversions-1.11.9-r1.ebuild b/dev-ros/eigen_conversions/eigen_conversions-1.11.9-r1.ebuild
deleted file mode 100644
index 4065fd42f096..000000000000
--- a/dev-ros/eigen_conversions/eigen_conversions-1.11.9-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Conversion functions between Eigen and KDL and Eigen and geometry_msgs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- sci-libs/orocos_kdl:=
- dev-cpp/eigen:3
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/cmake_modules
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/eigen_conversions/eigen_conversions-1.12.0.ebuild b/dev-ros/eigen_conversions/eigen_conversions-1.12.0.ebuild
deleted file mode 100644
index 4065fd42f096..000000000000
--- a/dev-ros/eigen_conversions/eigen_conversions-1.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Conversion functions between Eigen and KDL and Eigen and geometry_msgs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- sci-libs/orocos_kdl:=
- dev-cpp/eigen:3
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/cmake_modules
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/eigen_conversions/eigen_conversions-1.13.2.ebuild b/dev-ros/eigen_conversions/eigen_conversions-1.13.2.ebuild
new file mode 100644
index 000000000000..c6eeb55ec947
--- /dev/null
+++ b/dev-ros/eigen_conversions/eigen_conversions-1.13.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Conversion functions between Eigen and KDL and Eigen and geometry_msgs"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ sci-libs/orocos_kdl:=
+"
+DEPEND="${RDEPEND}
+ dev-cpp/eigen:3
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/cmake_modules
+"
diff --git a/dev-ros/eigen_conversions/eigen_conversions-9999.ebuild b/dev-ros/eigen_conversions/eigen_conversions-9999.ebuild
index 4065fd42f096..c6eeb55ec947 100644
--- a/dev-ros/eigen_conversions/eigen_conversions-9999.ebuild
+++ b/dev-ros/eigen_conversions/eigen_conversions-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/geometry"
KEYWORDS="~amd64 ~arm"
@@ -16,9 +16,10 @@ IUSE=""
RDEPEND="
sci-libs/orocos_kdl:=
+"
+DEPEND="${RDEPEND}
dev-cpp/eigen:3
dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/cmake_modules
"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/geometry_msgs/Manifest b/dev-ros/geometry_msgs/Manifest
index ecd600bcf5a0..1b3452d0da2a 100644
--- a/dev-ros/geometry_msgs/Manifest
+++ b/dev-ros/geometry_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-EBUILD geometry_msgs-1.12.5.ebuild 491 BLAKE2B f4b72707c0aac23ebf9a21be97e9e239a862ffd88b9ca9305722fee3c211f960b0bb3858219cd6963dea131a3e16ac6f2b09fb714c5fa2b76236b8ab1784fb0a SHA512 70c2fa663f1b22509a8c7534f27588d47a6eb0fc0d28603272f594ced520e6c7b0020ec17290940e12d943e91c42a01762f9b29026c66fff555aeaf962578f46
-EBUILD geometry_msgs-1.12.6.ebuild 491 BLAKE2B f4b72707c0aac23ebf9a21be97e9e239a862ffd88b9ca9305722fee3c211f960b0bb3858219cd6963dea131a3e16ac6f2b09fb714c5fa2b76236b8ab1784fb0a SHA512 70c2fa663f1b22509a8c7534f27588d47a6eb0fc0d28603272f594ced520e6c7b0020ec17290940e12d943e91c42a01762f9b29026c66fff555aeaf962578f46
-EBUILD geometry_msgs-1.12.7.ebuild 491 BLAKE2B f4b72707c0aac23ebf9a21be97e9e239a862ffd88b9ca9305722fee3c211f960b0bb3858219cd6963dea131a3e16ac6f2b09fb714c5fa2b76236b8ab1784fb0a SHA512 70c2fa663f1b22509a8c7534f27588d47a6eb0fc0d28603272f594ced520e6c7b0020ec17290940e12d943e91c42a01762f9b29026c66fff555aeaf962578f46
-EBUILD geometry_msgs-9999.ebuild 491 BLAKE2B f4b72707c0aac23ebf9a21be97e9e239a862ffd88b9ca9305722fee3c211f960b0bb3858219cd6963dea131a3e16ac6f2b09fb714c5fa2b76236b8ab1784fb0a SHA512 70c2fa663f1b22509a8c7534f27588d47a6eb0fc0d28603272f594ced520e6c7b0020ec17290940e12d943e91c42a01762f9b29026c66fff555aeaf962578f46
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
+EBUILD geometry_msgs-1.13.0.ebuild 451 BLAKE2B 39a05e85cab199e2453dc34695bbd609db63d8dc510d737c9d776ea64f61f94a40660fd630700e903d828ee6941c580cfa1b3fb73cfbd8a4dbed7a8d0e6ac0fd SHA512 2e8682b8dd369f01515f289dba73ad2ef975feb2b97277b89935b850657c83748e1eb380e132552d8ea229f87fd757b5d0196b1b9e81203dc87538d60b6e3365
+EBUILD geometry_msgs-9999.ebuild 451 BLAKE2B 39a05e85cab199e2453dc34695bbd609db63d8dc510d737c9d776ea64f61f94a40660fd630700e903d828ee6941c580cfa1b3fb73cfbd8a4dbed7a8d0e6ac0fd SHA512 2e8682b8dd369f01515f289dba73ad2ef975feb2b97277b89935b850657c83748e1eb380e132552d8ea229f87fd757b5d0196b1b9e81203dc87538d60b6e3365
MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/geometry_msgs/geometry_msgs-1.12.5.ebuild b/dev-ros/geometry_msgs/geometry_msgs-1.12.5.ebuild
deleted file mode 100644
index 919f51717116..000000000000
--- a/dev-ros/geometry_msgs/geometry_msgs-1.12.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for common geometric primitives such as points, vectors, and poses"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/geometry_msgs/geometry_msgs-1.12.6.ebuild b/dev-ros/geometry_msgs/geometry_msgs-1.12.6.ebuild
deleted file mode 100644
index 919f51717116..000000000000
--- a/dev-ros/geometry_msgs/geometry_msgs-1.12.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for common geometric primitives such as points, vectors, and poses"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/geometry_msgs/geometry_msgs-1.12.7.ebuild b/dev-ros/geometry_msgs/geometry_msgs-1.12.7.ebuild
deleted file mode 100644
index 919f51717116..000000000000
--- a/dev-ros/geometry_msgs/geometry_msgs-1.12.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for common geometric primitives such as points, vectors, and poses"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/geometry_msgs/geometry_msgs-1.13.0.ebuild b/dev-ros/geometry_msgs/geometry_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..ccebfac4361b
--- /dev/null
+++ b/dev-ros/geometry_msgs/geometry_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for common geometric primitives such as points, vectors, and poses"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild b/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild
index 919f51717116..ccebfac4361b 100644
--- a/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild
+++ b/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/common_msgs"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
diff --git a/dev-ros/hardware_interface/Manifest b/dev-ros/hardware_interface/Manifest
index b776cfe91324..354326817b3f 100644
--- a/dev-ros/hardware_interface/Manifest
+++ b/dev-ros/hardware_interface/Manifest
@@ -1,4 +1,4 @@
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD hardware_interface-0.15.1.ebuild 389 BLAKE2B ea9053d0704382f430d5f292b6e85bfbca99f4195300bfe08c2367533c79115207af69b881110c13ecd8c01f1bcef9c4d3bf77eb81b77c322ab610488c38db23 SHA512 e1435146e9df259f3d9442a6cd429a685f422a3f854e07a32e6f0092a7e368b04d3cd47286ef70fc869d0ab24d13b8b6e52f953b119e85027337629f831547bf
-EBUILD hardware_interface-9999.ebuild 389 BLAKE2B ea9053d0704382f430d5f292b6e85bfbca99f4195300bfe08c2367533c79115207af69b881110c13ecd8c01f1bcef9c4d3bf77eb81b77c322ab610488c38db23 SHA512 e1435146e9df259f3d9442a6cd429a685f422a3f854e07a32e6f0092a7e368b04d3cd47286ef70fc869d0ab24d13b8b6e52f953b119e85027337629f831547bf
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD hardware_interface-0.19.1.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
+EBUILD hardware_interface-9999.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/hardware_interface/hardware_interface-0.15.1.ebuild b/dev-ros/hardware_interface/hardware_interface-0.15.1.ebuild
deleted file mode 100644
index a2893f32df40..000000000000
--- a/dev-ros/hardware_interface/hardware_interface-0.15.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Hardware Interface base class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest dev-ros/rostest )"
diff --git a/dev-ros/hardware_interface/hardware_interface-0.19.1.ebuild b/dev-ros/hardware_interface/hardware_interface-0.19.1.ebuild
new file mode 100644
index 000000000000..534f5a3f8d25
--- /dev/null
+++ b/dev-ros/hardware_interface/hardware_interface-0.19.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Hardware Interface base class"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/roscpp"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest dev-ros/rostest )"
diff --git a/dev-ros/hardware_interface/hardware_interface-9999.ebuild b/dev-ros/hardware_interface/hardware_interface-9999.ebuild
index a2893f32df40..534f5a3f8d25 100644
--- a/dev-ros/hardware_interface/hardware_interface-9999.ebuild
+++ b/dev-ros/hardware_interface/hardware_interface-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-controls/ros_control"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
diff --git a/dev-ros/image_cb_detector/Manifest b/dev-ros/image_cb_detector/Manifest
index 2bbc98ad1426..37b3adb14ef0 100644
--- a/dev-ros/image_cb_detector/Manifest
+++ b/dev-ros/image_cb_detector/Manifest
@@ -2,6 +2,6 @@ AUX boost170.patch 551 BLAKE2B c98a11a8faa4c22d78e991bfa911b13bcf66fe3b8b8be2efc
AUX c11.patch 587 BLAKE2B 2cf07b3b5eebf9840bd45aa419283cc53e03dc45c5cf4eab6cd5894143983c7cb05146c9242c91ac105c90bba8d878ff8da4776629f04fc3f32b5290aa59fd87 SHA512 1ae09e987fb231400594019832f8a6d42ca1ebd07eafaca151d08812d8a4b62f95d4fadac0227c96d115c69da24bc3889f7d30af27000347ee000a937ae2b498
AUX gcc6.patch 495 BLAKE2B 50ac60a74148e3e32b2a69750cad6d98ce2ecef22ed4462431821075f6e247290e28b8d57b58b4b86a7cb9600988a8e22ea2aa5508da6dd6ac85a93aac197ad1 SHA512 5b99edada624eabd4830997677ebb4916c6a9a3c631eead6ae723985e3ce5a0f3b77c484777182a34e727dba869181d11002ba38cfb49cf20eb0832aca67f6bb
DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD image_cb_detector-0.10.14-r1.ebuild 959 BLAKE2B 13f8864e7892b30be430d1c3f5b9753a049ad9cb9fb61dcef6eb9bb6578a5687c0eb5724f9727455b463e7becd0d10e49e49e72246974f6f8eedba63c36ba07c SHA512 0e4bacf6310c9bd1c7fec693b39570ef1a8ef004a11769a5f83a5520f23cd101f6d152b38890008c83f60139bfb36dd1d7b48e97ba96b84115c057a02ae96e44
-EBUILD image_cb_detector-9999.ebuild 933 BLAKE2B afb1d6def81a9a3ca97bb1beefbf761626ca7a671268bb41f5fe7ef56c86a02028143f34a0d95ad82fb461181a9458aa9f13e38b77ddfa5e48c25ed2d3ed5357 SHA512 a74f31fc57efb8c52cc67127f694cf1776257773b2b575cb3786ede25618453980c0688bf519bf63e34947e31ca3fbb24703dc7e5506e6962f1bd4999d2756a9
+EBUILD image_cb_detector-0.10.14-r1.ebuild 954 BLAKE2B 65b5074a194abc99d883de00d65215cef9988b684b2882dc0fea370f334a8c85c42853a0f792c0e61d7c751aaefaefceac9a63ac283d5ba85b1bbebbd2ee6aed SHA512 fbe8895058d2bb0cf854fd4cb5a95459b81b6fcae5e5aac995f2b9a17db41e53003ec2bf87d500b801f04a6a4d66c36635dc07d33298f5ac8d5d5a1d63d5d43e
+EBUILD image_cb_detector-9999.ebuild 954 BLAKE2B 65b5074a194abc99d883de00d65215cef9988b684b2882dc0fea370f334a8c85c42853a0f792c0e61d7c751aaefaefceac9a63ac283d5ba85b1bbebbd2ee6aed SHA512 fbe8895058d2bb0cf854fd4cb5a95459b81b6fcae5e5aac995f2b9a17db41e53003ec2bf87d500b801f04a6a4d66c36635dc07d33298f5ac8d5d5a1d63d5d43e
MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
index 2502c78f860a..66f4d62a67cc 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
+++ b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/actionlib_msgs dev-ros/std_msgs"
@@ -23,10 +22,12 @@ RDEPEND="
dev-ros/image_transport
dev-ros/message_filters
dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
dev-ros/rospy[${PYTHON_USEDEP}]
dev-libs/boost:=[threads]
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
index 8b96da0e6b06..66f4d62a67cc 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
+++ b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/actionlib_msgs dev-ros/std_msgs"
@@ -23,10 +22,12 @@ RDEPEND="
dev-ros/image_transport
dev-ros/message_filters
dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
dev-ros/rospy[${PYTHON_USEDEP}]
dev-libs/boost:=[threads]
"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" )
+DEPEND="${RDEPEND}
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/image_proc/Manifest b/dev-ros/image_proc/Manifest
index 5480a59ea12e..532605137ec2 100644
--- a/dev-ros/image_proc/Manifest
+++ b/dev-ros/image_proc/Manifest
@@ -1,8 +1,4 @@
-DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
-DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
-EBUILD image_proc-1.12.22-r1.ebuild 651 BLAKE2B 1da86d1caf1f9f81d704e80324f997bfff5cfbe8d4cc73d7689e171eba51d475742c3098827bbdeada5399e02808410975fb5a22a44aa5c31d8bb823f932fcd2 SHA512 7dfe7d9ea0706efaef13299b1f4a6e41676c593e5c23baa2b5cb118a7d1288325d2dfae29f273e130f08ab1fbdd8c2ccb5b5238ddec30379ce63c4fce620fc35
-EBUILD image_proc-1.12.23.ebuild 651 BLAKE2B d01b42e8fb22054539ad4eb4f55993ddf8887fe1c950eaa8ef6b9264348d73d82d32904984fe65500c2af4c0342e3f70023b8808d8d5a9a09dbafdd11963ffb4 SHA512 4db3b8b9a3ac3dc3e98c9896dceaa8652868bc8818072cb5144749491344dfb8662beb275c4462b5890400217b63c156ebdba9960cbdac0e18000a2a565497bc
-EBUILD image_proc-1.13.0.ebuild 648 BLAKE2B cbb98c94317f93e8b7344a988948d2b8d0eed6e663f9fe97309436f7564d787eecc612ddaae6f7799c028901aa5f44418aef0193cc7a8f6aa14bbc86a4a69e3e SHA512 e5de63d615616bd3ed32106d2118525de6838ac63e30f24cfe66e0b34d98ebbfae5a7c4a1e57b98be24b19665ceae64aa1713b34eac5a4c237e0b4dfe51ed1ac
-EBUILD image_proc-9999.ebuild 651 BLAKE2B 1da86d1caf1f9f81d704e80324f997bfff5cfbe8d4cc73d7689e171eba51d475742c3098827bbdeada5399e02808410975fb5a22a44aa5c31d8bb823f932fcd2 SHA512 7dfe7d9ea0706efaef13299b1f4a6e41676c593e5c23baa2b5cb118a7d1288325d2dfae29f273e130f08ab1fbdd8c2ccb5b5238ddec30379ce63c4fce620fc35
+DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
+EBUILD image_proc-1.15.2.ebuild 621 BLAKE2B aee40bf23b84fdbe53c12de98c0998b2a8dd941cbaa75abb10db4c5047f6e4945ee7df47a24c0b9645122482df5e6413673c3105f6f7d2ee650cb61f1d0d3e8c SHA512 7430ac99c63cbb36c59926aedcdff576241e72d215f8105be326a0b76d559fb1f38727882224c5d9cafe129113839dce7702c2ef9a87ea4fb5d11070d178a017
+EBUILD image_proc-9999.ebuild 621 BLAKE2B aee40bf23b84fdbe53c12de98c0998b2a8dd941cbaa75abb10db4c5047f6e4945ee7df47a24c0b9645122482df5e6413673c3105f6f7d2ee650cb61f1d0d3e8c SHA512 7430ac99c63cbb36c59926aedcdff576241e72d215f8105be326a0b76d559fb1f38727882224c5d9cafe129113839dce7702c2ef9a87ea4fb5d11070d178a017
MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_proc/image_proc-1.12.22-r1.ebuild b/dev-ros/image_proc/image_proc-1.12.22-r1.ebuild
deleted file mode 100644
index bd66af15e302..000000000000
--- a/dev-ros/image_proc/image_proc-1.12.22-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Single image rectification and color processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- dev-ros/dynamic_reconfigure
- dev-ros/image_geometry
- dev-ros/image_transport
- dev-ros/nodelet
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- media-libs/opencv:=
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_proc/image_proc-1.12.23.ebuild b/dev-ros/image_proc/image_proc-1.12.23.ebuild
deleted file mode 100644
index 5f6d762c33e0..000000000000
--- a/dev-ros/image_proc/image_proc-1.12.23.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Single image rectification and color processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- dev-ros/dynamic_reconfigure
- dev-ros/image_geometry
- dev-ros/image_transport
- dev-ros/nodelet
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- media-libs/opencv:=
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_proc/image_proc-1.13.0.ebuild b/dev-ros/image_proc/image_proc-1.13.0.ebuild
deleted file mode 100644
index 9a57f7096740..000000000000
--- a/dev-ros/image_proc/image_proc-1.13.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Single image rectification and color processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- dev-ros/dynamic_reconfigure
- dev-ros/image_geometry
- dev-ros/image_transport
- dev-ros/nodelet
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- media-libs/opencv:=
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_proc/image_proc-1.15.2.ebuild b/dev-ros/image_proc/image_proc-1.15.2.ebuild
new file mode 100644
index 000000000000..088890f6b623
--- /dev/null
+++ b/dev-ros/image_proc/image_proc-1.15.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Single image rectification and color processing"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge
+ dev-ros/dynamic_reconfigure
+ dev-ros/image_geometry
+ dev-ros/image_transport
+ dev-ros/nodelet
+ dev-libs/console_bridge:=
+ dev-ros/roscpp
+ media-libs/opencv:=
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/image_proc/image_proc-9999.ebuild b/dev-ros/image_proc/image_proc-9999.ebuild
index bd66af15e302..088890f6b623 100644
--- a/dev-ros/image_proc/image_proc-9999.ebuild
+++ b/dev-ros/image_proc/image_proc-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
@@ -22,8 +21,9 @@ RDEPEND="
dev-ros/nodelet
dev-libs/console_bridge:=
dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
media-libs/opencv:=
dev-libs/boost:=[threads]
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/image_publisher/Manifest b/dev-ros/image_publisher/Manifest
index fe1e2186c5bf..865a8f946b8e 100644
--- a/dev-ros/image_publisher/Manifest
+++ b/dev-ros/image_publisher/Manifest
@@ -1,9 +1,4 @@
-AUX ocv4.patch 1826 BLAKE2B 647de2fc507e52734fb9e4c4c13043fd1424c2ab78ddbf2edb876660b5344877b8389ffc1194b20391249fad699c6e50305421f2ce8d58f880953e155de53120 SHA512 ef84c6d0ca37718b025dd570df596f8cd83bf8d5ca6e1bce5ad0725fdf852c55dbae876bea15f3e9534177b13538bfcaef7d6cf693c29e6ca4e99b3276acc7eb
-DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
-DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
-EBUILD image_publisher-1.12.22-r1.ebuild 659 BLAKE2B 315872591ff8deecf72a17396468817f79cfced2e9464985b89928c930ccd0d00687ed39793c8578b333cc4a945c647485a9bfba133659d2f6d647f9d22f381d SHA512 76b8ec87fcbdee7eb69923308d18e304ae6286c4de807568859b94e9d7e5ab9e4f6c5ab6634fe02f4d8ed082a53a2ed23469b21af820a110d801d8b700c5352c
-EBUILD image_publisher-1.12.23.ebuild 659 BLAKE2B e0fefc67d3680c3bd1e2cf54d32eedd4d1e997de6707f4b77604d776a5b63ef67a423ed0618b3566f2272f94a2500507c5ad0de1d44858de9d0a81fec9f96e1b SHA512 ffd763e3b47a77022e3ee17b180e629e3297fce8f85d34e40997019e3ee4f0a0cb01fe898b1a16b665d91c3d1a60c9312d97cbe6fdb1391796c4e087726f2155
-EBUILD image_publisher-1.13.0.ebuild 697 BLAKE2B 9c613067b2e7b88e45ad4dbe0df663ea785b1ebffb76d3bf146afab6295cb46ca51e5f2c560b66e0222b2cae572b4dfcf643066f4b49fb96a5dd1346508fbdfc SHA512 5e265bdbed1d7a3b89f4d4c1ebdb967ef7052ef7930dc41c7466d3ce002a6beb23aa6b9d201759deb1421c79194278f9894ec8dec623b823d834eb79f0a51368
-EBUILD image_publisher-9999.ebuild 659 BLAKE2B 315872591ff8deecf72a17396468817f79cfced2e9464985b89928c930ccd0d00687ed39793c8578b333cc4a945c647485a9bfba133659d2f6d647f9d22f381d SHA512 76b8ec87fcbdee7eb69923308d18e304ae6286c4de807568859b94e9d7e5ab9e4f6c5ab6634fe02f4d8ed082a53a2ed23469b21af820a110d801d8b700c5352c
+DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
+EBUILD image_publisher-1.15.2.ebuild 629 BLAKE2B 9f1a0ad822d5f699a9464052a91d7121584d61c85d971c2e5dd85b642fd04809b8e3cb7a4c26ae36a3441495554347cc5de49229d749bd43f83a01a770c9617f SHA512 48ab3110a492d8bcbbc678bd20425927e43d84d8a722771b7c1c4385a7b6a06b7fb9e9091d02163962f628ec6eea507aeee8d265d235d72f446325333c9a2739
+EBUILD image_publisher-9999.ebuild 629 BLAKE2B 9f1a0ad822d5f699a9464052a91d7121584d61c85d971c2e5dd85b642fd04809b8e3cb7a4c26ae36a3441495554347cc5de49229d749bd43f83a01a770c9617f SHA512 48ab3110a492d8bcbbc678bd20425927e43d84d8a722771b7c1c4385a7b6a06b7fb9e9091d02163962f628ec6eea507aeee8d265d235d72f446325333c9a2739
MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_publisher/files/ocv4.patch b/dev-ros/image_publisher/files/ocv4.patch
deleted file mode 100644
index 12baac2d8473..000000000000
--- a/dev-ros/image_publisher/files/ocv4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: image_publisher/CMakeLists.txt
-===================================================================
---- image_publisher.orig/CMakeLists.txt
-+++ image_publisher/CMakeLists.txt
-@@ -10,7 +10,7 @@ message(STATUS "opencv version ${OpenCV_
- if(OpenCV_VERSION VERSION_LESS "3.0.0")
- find_package(OpenCV 2 REQUIRED COMPONENTS ${opencv_2_components})
- else()
-- find_package(OpenCV 3 REQUIRED COMPONENTS ${opencv_3_components})
-+ find_package(OpenCV REQUIRED COMPONENTS ${opencv_3_components})
- endif()
-
- # generate the dynamic_reconfigure config file
-Index: image_publisher/src/nodelet/image_publisher_nodelet.cpp
-===================================================================
---- image_publisher.orig/src/nodelet/image_publisher_nodelet.cpp
-+++ image_publisher/src/nodelet/image_publisher_nodelet.cpp
-@@ -95,7 +95,7 @@ class ImagePublisherNodelet : public nod
- {
- if ( cap_.isOpened() ) {
- if ( ! cap_.read(image_) ) {
-- cap_.set(CV_CAP_PROP_POS_FRAMES, 0);
-+ cap_.set(cv::CAP_PROP_POS_FRAMES, 0);
- }
- }
- if (flip_image_)
-@@ -136,7 +136,7 @@ public:
- nh_.param("filename", filename_, std::string(""));
- NODELET_INFO("File name for publishing image is : %s", filename_.c_str());
- try {
-- image_ = cv::imread(filename_, CV_LOAD_IMAGE_COLOR);
-+ image_ = cv::imread(filename_, cv::IMREAD_COLOR);
- if ( image_.empty() ) { // if filename is motion file or device file
- try { // if filename is number
- int num = boost::lexical_cast(filename_);//num is 1234798797
-@@ -146,7 +146,7 @@ public:
- }
- CV_Assert(cap_.isOpened());
- cap_.read(image_);
-- cap_.set(CV_CAP_PROP_POS_FRAMES, 0);
-+ cap_.set(cv::CAP_PROP_POS_FRAMES, 0);
- }
- CV_Assert(!image_.empty());
- }
diff --git a/dev-ros/image_publisher/image_publisher-1.12.22-r1.ebuild b/dev-ros/image_publisher/image_publisher-1.12.22-r1.ebuild
deleted file mode 100644
index 7a3fea27064f..000000000000
--- a/dev-ros/image_publisher/image_publisher-1.12.22-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Publish an image stream from single image file or avi file."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- media-libs/opencv:=
- dev-ros/dynamic_reconfigure
- dev-ros/camera_info_manager
- dev-ros/image_transport
- dev-ros/nodelet
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_publisher/image_publisher-1.12.23.ebuild b/dev-ros/image_publisher/image_publisher-1.12.23.ebuild
deleted file mode 100644
index 44b01c18391f..000000000000
--- a/dev-ros/image_publisher/image_publisher-1.12.23.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Publish an image stream from single image file or avi file."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- media-libs/opencv:=
- dev-ros/dynamic_reconfigure
- dev-ros/camera_info_manager
- dev-ros/image_transport
- dev-ros/nodelet
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_publisher/image_publisher-1.13.0.ebuild b/dev-ros/image_publisher/image_publisher-1.13.0.ebuild
deleted file mode 100644
index dd6ff1f0df2e..000000000000
--- a/dev-ros/image_publisher/image_publisher-1.13.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Publish an image stream from single image file or avi file."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- >=media-libs/opencv-4:=
- dev-ros/dynamic_reconfigure
- dev-ros/camera_info_manager
- dev-ros/image_transport
- dev-ros/nodelet
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/image_publisher/image_publisher-1.15.2.ebuild b/dev-ros/image_publisher/image_publisher-1.15.2.ebuild
new file mode 100644
index 000000000000..34d0c0948d93
--- /dev/null
+++ b/dev-ros/image_publisher/image_publisher-1.15.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Publish an image stream from single image file or avi file."
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge
+ media-libs/opencv:=
+ dev-ros/dynamic_reconfigure
+ dev-ros/camera_info_manager
+ dev-ros/image_transport
+ dev-ros/nodelet
+ dev-libs/console_bridge:=
+ dev-ros/roscpp
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/image_publisher/image_publisher-9999.ebuild b/dev-ros/image_publisher/image_publisher-9999.ebuild
index 7a3fea27064f..34d0c0948d93 100644
--- a/dev-ros/image_publisher/image_publisher-9999.ebuild
+++ b/dev-ros/image_publisher/image_publisher-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
@@ -23,7 +22,8 @@ RDEPEND="
dev-ros/nodelet
dev-libs/console_bridge:=
dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-libs/boost:=
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/image_rotate/Manifest b/dev-ros/image_rotate/Manifest
index a465c719fd51..b91313d7d241 100644
--- a/dev-ros/image_rotate/Manifest
+++ b/dev-ros/image_rotate/Manifest
@@ -1,8 +1,4 @@
-DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
-DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
-EBUILD image_rotate-1.12.22-r1.ebuild 679 BLAKE2B e69271b3169a0e6ee0734c9c00c465df97b9af950a102024546aa52778293e6aa0edf3b33697ffff4a33b439af4957934e1f6fdfb4bade19b798adff2a48d6b4 SHA512 2760cfc1c6408482a26057a7135f5859d4950c166992b8c4505b91018cb0fad4c9d53771542539d91c57386dc9e43a97fcdb7ed98403bdb4bf71fb429a0ae96e
-EBUILD image_rotate-1.12.23.ebuild 679 BLAKE2B aef3ad1496da9a3d3a536c4c06d3dfb57608d6684f9b741451fe98edc910ce7bb18b36e647604b280db642ee0d564151b8bd8c36def042d2f0a8730c96dc46ea SHA512 a3663e2ec6ce2dbd65547963c62996c55424cae45f94aaa3adc481f59fc11cb70196df22f9ea7c0ac63f226fb6a0a424d7b27915db58796d48f6f16c67b72cbc
-EBUILD image_rotate-1.13.0.ebuild 676 BLAKE2B 2e706671381494a77564ba69608dcd01085b8118df68557aaefb7aec918a5fb110011852d818c145df0825c582bdce1b31eb431740ab58bb7f653b97a2d16ffa SHA512 ba9276de66392cf8389abe68862bf0fd0a7ba80665a51057ac2cf672d38ecc1c01ebe18950995800eebf5206575b770ff8931e13196e7493fc29b774d9b9d629
-EBUILD image_rotate-9999.ebuild 679 BLAKE2B e69271b3169a0e6ee0734c9c00c465df97b9af950a102024546aa52778293e6aa0edf3b33697ffff4a33b439af4957934e1f6fdfb4bade19b798adff2a48d6b4 SHA512 2760cfc1c6408482a26057a7135f5859d4950c166992b8c4505b91018cb0fad4c9d53771542539d91c57386dc9e43a97fcdb7ed98403bdb4bf71fb429a0ae96e
+DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
+EBUILD image_rotate-1.15.2.ebuild 630 BLAKE2B 18376c9b73e3fb2b5b7e178dad1369c4e82f8aa644c4fb562d8baf454213f4c05699a432b5972eddd9d486219697c3d4b23a3fcffc0fde791e1ded0c64ddc8f2 SHA512 c7580420cf209e54a04ed643266e532761ce84016d030490df785502ff063d8de70786f2ab2dff808cfbb1c086d8147533eedaeb5cad65858211aff1a540beb8
+EBUILD image_rotate-9999.ebuild 630 BLAKE2B 18376c9b73e3fb2b5b7e178dad1369c4e82f8aa644c4fb562d8baf454213f4c05699a432b5972eddd9d486219697c3d4b23a3fcffc0fde791e1ded0c64ddc8f2 SHA512 c7580420cf209e54a04ed643266e532761ce84016d030490df785502ff063d8de70786f2ab2dff808cfbb1c086d8147533eedaeb5cad65858211aff1a540beb8
MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_rotate/image_rotate-1.12.22-r1.ebuild b/dev-ros/image_rotate/image_rotate-1.12.22-r1.ebuild
deleted file mode 100644
index eecbe94dd9f4..000000000000
--- a/dev-ros/image_rotate/image_rotate-1.12.22-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- media-libs/opencv:=
- dev-ros/dynamic_reconfigure
- dev-ros/eigen_conversions
- dev-ros/image_transport
- dev-ros/nodelet
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-ros/tf2
- dev-ros/tf2_geometry_msgs
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_rotate/image_rotate-1.12.23.ebuild b/dev-ros/image_rotate/image_rotate-1.12.23.ebuild
deleted file mode 100644
index c501661beb9e..000000000000
--- a/dev-ros/image_rotate/image_rotate-1.12.23.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- media-libs/opencv:=
- dev-ros/dynamic_reconfigure
- dev-ros/eigen_conversions
- dev-ros/image_transport
- dev-ros/nodelet
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-ros/tf2
- dev-ros/tf2_geometry_msgs
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_rotate/image_rotate-1.13.0.ebuild b/dev-ros/image_rotate/image_rotate-1.13.0.ebuild
deleted file mode 100644
index 1d31862840cd..000000000000
--- a/dev-ros/image_rotate/image_rotate-1.13.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- media-libs/opencv:=
- dev-ros/dynamic_reconfigure
- dev-ros/eigen_conversions
- dev-ros/image_transport
- dev-ros/nodelet
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-ros/tf2
- dev-ros/tf2_geometry_msgs
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_rotate/image_rotate-1.15.2.ebuild b/dev-ros/image_rotate/image_rotate-1.15.2.ebuild
new file mode 100644
index 000000000000..37756f13089c
--- /dev/null
+++ b/dev-ros/image_rotate/image_rotate-1.15.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Rotates an image minimizing the angle between a vector and the camera frame"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge
+ media-libs/opencv:=
+ dev-ros/dynamic_reconfigure
+ dev-ros/eigen_conversions
+ dev-ros/image_transport
+ dev-ros/nodelet
+ dev-libs/console_bridge:=
+ dev-ros/roscpp
+ dev-ros/tf2
+ dev-ros/tf2_geometry_msgs
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_rotate/image_rotate-9999.ebuild b/dev-ros/image_rotate/image_rotate-9999.ebuild
index eecbe94dd9f4..37756f13089c 100644
--- a/dev-ros/image_rotate/image_rotate-9999.ebuild
+++ b/dev-ros/image_rotate/image_rotate-9999.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame"
+DESCRIPTION="Rotates an image minimizing the angle between a vector and the camera frame"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/image_view/Manifest b/dev-ros/image_view/Manifest
index ed5c883da3bf..bb358d86b5b8 100644
--- a/dev-ros/image_view/Manifest
+++ b/dev-ros/image_view/Manifest
@@ -1,7 +1,4 @@
-AUX boost170.patch 513 BLAKE2B c78a511ebf9ec506d75ba5ad639932321ff5542d5812db3e7b448765aff92c9b3e75f299c0ef15626cd5bbd6a34acee9efe202dc2f38dc20478b3f8e2f6b2577 SHA512 15c4024d4de848e06b47d845dd33758cac44c1e2c07982749a523a7d8d852921fff1306aa105f65df6d5152a09e974a0cfb8c1f70859cc415f51b1e1ec9e2b79
-DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
-EBUILD image_view-1.12.23.ebuild 879 BLAKE2B fa54faf98131e0639ebfb8b375c3e6d09b7765ec108cdba4a91adfbc20a74a6dc9053d4b09f306329d0f97a675c347ef2363480508bee8e84869221b3c60d002 SHA512 f5ae3c9cdd3297cdea49c0a9ad6083e547bfc4327360e362001a044e26b9fed332465ececc8a3f2ff6c1b63092a65b17b6267274db7c55cbdc10bd5ec182754e
-EBUILD image_view-1.13.0.ebuild 838 BLAKE2B bea07f7d3bd91a3065f787a854916581e51fd718d33138828ed33a774e80b7c488deafd64899ce56ad69bd631ebdd3b6abdbb018dbc2ada14c7eaefd6b472032 SHA512 2673f92cba702ef2c199f873d64c3e38bc7f0a957e7988fdd4a32bb83cb2fc05ec34313b03ae194ee44975d782b4f93c9eeb6c2cfdeaa03e14583b982a4d0a83
-EBUILD image_view-9999.ebuild 838 BLAKE2B bea07f7d3bd91a3065f787a854916581e51fd718d33138828ed33a774e80b7c488deafd64899ce56ad69bd631ebdd3b6abdbb018dbc2ada14c7eaefd6b472032 SHA512 2673f92cba702ef2c199f873d64c3e38bc7f0a957e7988fdd4a32bb83cb2fc05ec34313b03ae194ee44975d782b4f93c9eeb6c2cfdeaa03e14583b982a4d0a83
+DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
+EBUILD image_view-1.15.2.ebuild 811 BLAKE2B a22ad991db196c294e1029af33eef78ced66d90e622bab05721962e4b578adc43dd85b001576089396451a1824b76a7bd121c04e297450564aefd1fc8a2cf427 SHA512 b3a2572cc4a53f5091f6e070d1a47c0c4dc5b16ce28413af3ac6e954a86108ad21a71eb96da908600173a808c762bb79041889badd2973aeb0f4cc39a4949d87
+EBUILD image_view-9999.ebuild 811 BLAKE2B a22ad991db196c294e1029af33eef78ced66d90e622bab05721962e4b578adc43dd85b001576089396451a1824b76a7bd121c04e297450564aefd1fc8a2cf427 SHA512 b3a2572cc4a53f5091f6e070d1a47c0c4dc5b16ce28413af3ac6e954a86108ad21a71eb96da908600173a808c762bb79041889badd2973aeb0f4cc39a4949d87
MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_view/files/boost170.patch b/dev-ros/image_view/files/boost170.patch
deleted file mode 100644
index ab52d89c5fad..000000000000
--- a/dev-ros/image_view/files/boost170.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: image_view/CMakeLists.txt
-===================================================================
---- image_view.orig/CMakeLists.txt
-+++ image_view/CMakeLists.txt
-@@ -5,7 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
- generate_dynamic_reconfigure_options(cfg/ImageView.cfg)
-
- catkin_package(CATKIN_DEPENDS dynamic_reconfigure)
--find_package(Boost REQUIRED COMPONENTS signals thread)
-+find_package(Boost REQUIRED COMPONENTS thread)
- find_package(OpenCV REQUIRED)
-
- include_directories(${Boost_INCLUDE_DIRS}
diff --git a/dev-ros/image_view/image_view-1.12.23.ebuild b/dev-ros/image_view/image_view-1.12.23.ebuild
deleted file mode 100644
index b7c4e715c9e9..000000000000
--- a/dev-ros/image_view/image_view-1.12.23.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Simple viewer for ROS image topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/boost:=[threads]
- media-libs/opencv:=
- x11-libs/gtk+:2
- dev-ros/camera_calibration_parsers
- >=dev-ros/cv_bridge-1.11.10
- dev-ros/image_transport
- dev-ros/message_filters
- dev-ros/nodelet
- dev-ros/rosconsole
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/image_view/image_view-1.13.0.ebuild b/dev-ros/image_view/image_view-1.13.0.ebuild
deleted file mode 100644
index b9c0dff05bac..000000000000
--- a/dev-ros/image_view/image_view-1.13.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Simple viewer for ROS image topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/boost:=[threads]
- media-libs/opencv:=
- x11-libs/gtk+:2
- dev-ros/camera_calibration_parsers
- >=dev-ros/cv_bridge-1.11.10
- dev-ros/image_transport
- dev-ros/message_filters
- dev-ros/nodelet
- dev-ros/rosconsole
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_view/image_view-1.15.2.ebuild b/dev-ros/image_view/image_view-1.15.2.ebuild
new file mode 100644
index 000000000000..db425e971183
--- /dev/null
+++ b/dev-ros/image_view/image_view-1.15.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Simple viewer for ROS image topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ media-libs/opencv:=
+ x11-libs/gtk+:2
+ dev-ros/camera_calibration_parsers
+ >=dev-ros/cv_bridge-1.11.10
+ dev-ros/image_transport
+ dev-ros/message_filters
+ dev-ros/nodelet
+ dev-ros/rosconsole
+ dev-libs/console_bridge:=
+ dev-ros/roscpp
+ dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/image_view/image_view-9999.ebuild b/dev-ros/image_view/image_view-9999.ebuild
index b9c0dff05bac..db425e971183 100644
--- a/dev-ros/image_view/image_view-9999.ebuild
+++ b/dev-ros/image_view/image_view-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
@@ -26,9 +25,10 @@ RDEPEND="
dev-ros/rosconsole
dev-libs/console_bridge:=
dev-ros/roscpp
+ dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_complementary_filter/Manifest b/dev-ros/imu_complementary_filter/Manifest
index 635ac631d694..62ae38a84fe4 100644
--- a/dev-ros/imu_complementary_filter/Manifest
+++ b/dev-ros/imu_complementary_filter/Manifest
@@ -1,8 +1,4 @@
-DIST imu_tools-1.1.5.tar.gz 1653083 BLAKE2B 8c0e84333455a5b4cae215a2e54b74ff828d00a426b9ab13f4048a72556b6a526dc4256a53dc3e21e098cc31ea6d21e0d508066a4627d01c27681ce0b3b18035 SHA512 5009884852c71d6bb1b6c2be2f30ed333eca2ac6a7f29d02cb8f0821c0b95a33dd3b09049c4c4eeb1416fb0eb5dc454b3c6d36c2c24303f37c0d1d2c0c2d906a
-DIST imu_tools-1.2.0.tar.gz 1653607 BLAKE2B 76cccfeae657188e3be3774bcb19c5edac94e7070a6fd8a01c8a56857297491568f978820e6f32467b031ceece4742e6c0fe926e5d59ad19a2f6fb1c037ac3ec SHA512 3f39a2ec539949a6881cc106122d663706ddd3ed03ed822b9370e56beb56f1349bfd668a71e443ab2b9d525c6a3a88fad053768764160d9d0f04c08ba1ad2f8e
-DIST imu_tools-1.2.1.tar.gz 1654279 BLAKE2B 06e3b27708bec09fea448b636f77b1480310483468459496e3748ef786e20e10f67fe25aba3c2d128221e42762e70fa98eedeeb79185247c47388c71120ed166 SHA512 8bd7f817df4e564d255fd5820dcbc6dd8ffa762d1b32111ed2f8d9cc258096cba1f9602260f020860fe2988eb1412c6d0598de08e4cd79ede56a40d1371d1ff0
-EBUILD imu_complementary_filter-1.1.5.ebuild 598 BLAKE2B c16830be1c852c4e99d38535a6b1305478d94da0875f063d4ef3df176bfb072b9b4771bdd919a5b5e9288b4ceb4a91ad8320926f05ac2a30e5d606c1617ad512 SHA512 43ec4e9e3b2100312b3c8a2db4736f7daaedbfad0c05b8206384ef5af02c5b3d0192ddf9c02ec4ffc1cf129edcf72982d740fb23473dc7f67c61d9b92daf4bd7
-EBUILD imu_complementary_filter-1.2.0.ebuild 598 BLAKE2B e58418a4664e2552c8564ed4a411607c3eb2f25d218b12e79fb79345cb9457fb0044eca36eef10aec9a52f1626b7ebccd6bc393cbbe3eac49657fada0d1174f1 SHA512 0e6ad3862755f9d6f8bc73c337831efa885b669036986ebab789d47350851eb35ec00b8b567fd8494303c9c70da93052e2830769fd6366336ee9f9677102b328
-EBUILD imu_complementary_filter-1.2.1.ebuild 595 BLAKE2B 5c4e3b6515a836ad1cc234c520dba54178b7c4c2263886eabe1961b9a0f821a60fc4bca7af3cec0c95adabe967fd9eab29e54b00b02a689c2ee57187fcb6bd7a SHA512 7c7a0554e755b738b860d95ec5abf23c264c56b404a5d86793823352fbdf8e302c8a06814a159fd9e69f3a174ef4dffde5c56c887abbe392e8fda189e63843b4
-EBUILD imu_complementary_filter-9999.ebuild 598 BLAKE2B c16830be1c852c4e99d38535a6b1305478d94da0875f063d4ef3df176bfb072b9b4771bdd919a5b5e9288b4ceb4a91ad8320926f05ac2a30e5d606c1617ad512 SHA512 43ec4e9e3b2100312b3c8a2db4736f7daaedbfad0c05b8206384ef5af02c5b3d0192ddf9c02ec4ffc1cf129edcf72982d740fb23473dc7f67c61d9b92daf4bd7
+DIST imu_tools-1.2.2.tar.gz 1654829 BLAKE2B 1cd0ce321f6a9012146da07fc7f24425c1e68a8144b1ec3e5fefda316d07c3bc579f63f14adc4b86fc4f3975ad2d5c575ecfb2ae729d54ae3876a2ce2aa9d7f3 SHA512 d4b746acdf39e5137f54de9ac27f338bf89cd4102af5407ae0b6bb45c830b6a7da9250570000a7ed140187659d93934e5ecc3f2b1722f686a5cc8cbd52e986be
+EBUILD imu_complementary_filter-1.2.2.ebuild 587 BLAKE2B be25bfb649264fa13df02cb8a1b8a9711fba65c8c4ce8e6cc24cf7463f70860adf064508c5bfe1fbed6267c1708a8b5d093654ab679f93c41f1b6820d0657b0b SHA512 bee1c188cd555a4ac68c4edfb9665b19214bfc06d122cb51e1e2fd41d4fc27bc7c1977ab6b2be35653da842031a5bed1f7a14790bdc5031db564931bb27c696b
+EBUILD imu_complementary_filter-9999.ebuild 587 BLAKE2B be25bfb649264fa13df02cb8a1b8a9711fba65c8c4ce8e6cc24cf7463f70860adf064508c5bfe1fbed6267c1708a8b5d093654ab679f93c41f1b6820d0657b0b SHA512 bee1c188cd555a4ac68c4edfb9665b19214bfc06d122cb51e1e2fd41d4fc27bc7c1977ab6b2be35653da842031a5bed1f7a14790bdc5031db564931bb27c696b
MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.1.5.ebuild b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.1.5.ebuild
deleted file mode 100644
index d9eb91e64e14..000000000000
--- a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.1.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/message_filters
- dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
- dev-ros/cmake_modules
-"
diff --git a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.0.ebuild b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.0.ebuild
deleted file mode 100644
index bbbf6e05dd1b..000000000000
--- a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/message_filters
- dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
- dev-ros/cmake_modules
-"
diff --git a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.1.ebuild b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.1.ebuild
deleted file mode 100644
index 3990921e748c..000000000000
--- a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/message_filters
- dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
- dev-ros/cmake_modules
-"
diff --git a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.2.ebuild b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.2.ebuild
new file mode 100644
index 000000000000..6c1525c19499
--- /dev/null
+++ b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Fuses angular velocities, accelerations, and magnetic readings from an IMU"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/message_filters
+ dev-ros/roscpp
+ dev-ros/tf
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+BDEPEND="
+ dev-ros/cmake_modules
+"
diff --git a/dev-ros/imu_complementary_filter/imu_complementary_filter-9999.ebuild b/dev-ros/imu_complementary_filter/imu_complementary_filter-9999.ebuild
index d9eb91e64e14..6c1525c19499 100644
--- a/dev-ros/imu_complementary_filter/imu_complementary_filter-9999.ebuild
+++ b/dev-ros/imu_complementary_filter/imu_complementary_filter-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
KEYWORDS="~amd64"
@@ -9,7 +9,7 @@ ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
+DESCRIPTION="Fuses angular velocities, accelerations, and magnetic readings from an IMU"
LICENSE="BSD"
SLOT="0"
IUSE=""
@@ -17,11 +17,13 @@ IUSE=""
RDEPEND="
dev-ros/message_filters
dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/tf
dev-libs/boost:=
"
DEPEND="${RDEPEND}
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+BDEPEND="
dev-ros/cmake_modules
"
diff --git a/dev-ros/imu_filter_madgwick/Manifest b/dev-ros/imu_filter_madgwick/Manifest
index 04f00fa55599..34d0d87680f6 100644
--- a/dev-ros/imu_filter_madgwick/Manifest
+++ b/dev-ros/imu_filter_madgwick/Manifest
@@ -1,5 +1,4 @@
-AUX boost_signals.patch 617 BLAKE2B f7ee39beda0b22eb154e9ada0ded0d015fe7a926c40d57563f4e1619f8d770a305c035edfd222e8b9da9eec7f7fd27f84340d6f3053de654663510af3691342b SHA512 7e21054ab7ca3594f190211c1d55df9fea02552a104d8f382067c18545eafce4f3b17453b64d687d38d993c7cf54e137cf82113e8ddc9dc3f9ef763b269d8c82
-DIST imu_tools-1.2.1.tar.gz 1654279 BLAKE2B 06e3b27708bec09fea448b636f77b1480310483468459496e3748ef786e20e10f67fe25aba3c2d128221e42762e70fa98eedeeb79185247c47388c71120ed166 SHA512 8bd7f817df4e564d255fd5820dcbc6dd8ffa762d1b32111ed2f8d9cc258096cba1f9602260f020860fe2988eb1412c6d0598de08e4cd79ede56a40d1371d1ff0
-EBUILD imu_filter_madgwick-1.2.1.ebuild 798 BLAKE2B 53a0f91afd1285fc0ef66e8e17382acdaf0d9d2526c127d050540b3a86a52bb8205a3eb9c3d37f8449986b9036c56bf7917702909f317e76247b11889cc92c6c SHA512 e10214a59ac79a47b5e739570188f54fb27740f50f6b9e1d3e2e7a997a6712489068f8dc0f38fdaf73b236b6884e8ed61a57e74da9d46ba4c978a581edf077e6
-EBUILD imu_filter_madgwick-9999.ebuild 798 BLAKE2B 53a0f91afd1285fc0ef66e8e17382acdaf0d9d2526c127d050540b3a86a52bb8205a3eb9c3d37f8449986b9036c56bf7917702909f317e76247b11889cc92c6c SHA512 e10214a59ac79a47b5e739570188f54fb27740f50f6b9e1d3e2e7a997a6712489068f8dc0f38fdaf73b236b6884e8ed61a57e74da9d46ba4c978a581edf077e6
+DIST imu_tools-1.2.2.tar.gz 1654829 BLAKE2B 1cd0ce321f6a9012146da07fc7f24425c1e68a8144b1ec3e5fefda316d07c3bc579f63f14adc4b86fc4f3975ad2d5c575ecfb2ae729d54ae3876a2ce2aa9d7f3 SHA512 d4b746acdf39e5137f54de9ac27f338bf89cd4102af5407ae0b6bb45c830b6a7da9250570000a7ed140187659d93934e5ecc3f2b1722f686a5cc8cbd52e986be
+EBUILD imu_filter_madgwick-1.2.2.ebuild 732 BLAKE2B 8a49c8d52adc4eb7fd8aa24b1667acb8ea4ce4a3b6d1921aebb61ea950623193be4488b40710271a184fe6e6fddcee05fd91a85f46ec40f5772617f9f6c68f18 SHA512 9ea1efa839085499e55759d44bc18ca7b1aedbaca8b1494507be442acb09dc8d1941c14f01b221c6ded11d6a1731e0e7bd34e635377cf423e3b516d71846ab4f
+EBUILD imu_filter_madgwick-9999.ebuild 732 BLAKE2B 8a49c8d52adc4eb7fd8aa24b1667acb8ea4ce4a3b6d1921aebb61ea950623193be4488b40710271a184fe6e6fddcee05fd91a85f46ec40f5772617f9f6c68f18 SHA512 9ea1efa839085499e55759d44bc18ca7b1aedbaca8b1494507be442acb09dc8d1941c14f01b221c6ded11d6a1731e0e7bd34e635377cf423e3b516d71846ab4f
MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/imu_filter_madgwick/files/boost_signals.patch b/dev-ros/imu_filter_madgwick/files/boost_signals.patch
deleted file mode 100644
index 75d3130d9765..000000000000
--- a/dev-ros/imu_filter_madgwick/files/boost_signals.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imu_filter_madgwick/CMakeLists.txt
-===================================================================
---- imu_filter_madgwick.orig/CMakeLists.txt
-+++ imu_filter_madgwick/CMakeLists.txt
-@@ -3,7 +3,7 @@ project(imu_filter_madgwick)
-
- find_package(catkin REQUIRED COMPONENTS roscpp sensor_msgs geometry_msgs tf2 tf2_geometry_msgs tf2_ros nodelet pluginlib message_filters dynamic_reconfigure)
-
--find_package(Boost REQUIRED COMPONENTS system thread signals)
-+find_package(Boost REQUIRED COMPONENTS system thread)
-
- # Generate dynamic parameters
- generate_dynamic_reconfigure_options(cfg/ImuFilterMadgwick.cfg)
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild
deleted file mode 100644
index 44fb87672c7d..000000000000
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf2
- dev-ros/tf2_geometry_msgs
- dev-ros/tf2_ros
- dev-ros/nodelet
- dev-libs/console_bridge:=
- dev-ros/pluginlib
- dev-ros/message_filters
- dev-ros/dynamic_reconfigure
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rosunit )
-"
-PATCHES=( "${FILESDIR}/boost_signals.patch" )
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.2.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.2.ebuild
new file mode 100644
index 000000000000..859a2d856f81
--- /dev/null
+++ b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Fuses angular velocities, accelerations, and magnetic readings from an IMU"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/tf2
+ dev-ros/tf2_geometry_msgs
+ dev-ros/tf2_ros
+ dev-ros/nodelet
+ dev-libs/console_bridge:=
+ dev-ros/pluginlib
+ dev-ros/message_filters
+ dev-ros/dynamic_reconfigure
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ test? ( dev-ros/rosunit )
+"
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild
index 44fb87672c7d..859a2d856f81 100644
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild
+++ b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
KEYWORDS="~amd64"
@@ -9,15 +9,13 @@ ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
+DESCRIPTION="Fuses angular velocities, accelerations, and magnetic readings from an IMU"
LICENSE="GPL-2"
SLOT="0"
IUSE=""
RDEPEND="
dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/tf2
dev-ros/tf2_geometry_msgs
dev-ros/tf2_ros
@@ -29,6 +27,7 @@ RDEPEND="
dev-libs/boost:=[threads]
"
DEPEND="${RDEPEND}
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? ( dev-ros/rosunit )
"
-PATCHES=( "${FILESDIR}/boost_signals.patch" )
diff --git a/dev-ros/interactive_marker_tutorials/Manifest b/dev-ros/interactive_marker_tutorials/Manifest
index cde78917176c..0beacccbbbec 100644
--- a/dev-ros/interactive_marker_tutorials/Manifest
+++ b/dev-ros/interactive_marker_tutorials/Manifest
@@ -1,6 +1,4 @@
-DIST visualization_tutorials-0.10.3.tar.gz 428877 BLAKE2B 4bcd482ae61f29908ca23dda653d1c6d0e6a0a9df56df8343d1dfb5124f8d60c9a12ef8b1565c4655617dcd62d80a2aa51f2fd9b2c5329e33c3cc22e3e63c22d SHA512 2e484791851291d2316c7a20e92d988d71b6c41c98bad98c78bed465069dcfe5fc1ddd5c15c6981e951db2c114e965747c07e27f4851c2705af3dd036b992781
DIST visualization_tutorials-0.11.0.tar.gz 429489 BLAKE2B d4558a15b696ba05ed156a64ab2c0ad7229314f73d2823c0a46f53132801619d28fc5c68f5d8e0f3e2cadb7bb5078b3518da87ea18940432760b20bddeda578d SHA512 78ebe536a3a209fb0c61fb7dbc0aa115b5f4e6297303b1fc03740402decea719077037a90f4c45a0f6ece95e3578d6dad1095a0b1f0a90c136b738d0350aac9b
-EBUILD interactive_marker_tutorials-0.10.3-r1.ebuild 631 BLAKE2B a35e25dd19e6280ba002ea71274d10105f0ed40b43d2aab2a89db0a6c496b1c04068cebc5874533e2f1c6adb7e7dd711f92d2004d0a7b7abf9fae6b869b4104c SHA512 6ca56c0b03b28cfde6aae740c77481ff3b7c9cf4e21de0753f5e6784af4db43563165e369af15ba3c718d525bcbdf86ada545b80da4597fea557f91abb5e1d94
-EBUILD interactive_marker_tutorials-0.11.0.ebuild 631 BLAKE2B f3497f4d43a9b6fa9e3615115c0c1d185ca35917619f99c0b87e4f0a9b880788c860c067feef3ee5bf732bf9278032a0f21a92bf20b8c0e6cde0c8d4ae47308a SHA512 1326389a84f2a6e4662476b8c6f45cc4cb5c6b8946d6f1282d957613ac08030291ac4238ff2e75690cf1ac1997170e778d4d82155712a5385245054f26f841ff
-EBUILD interactive_marker_tutorials-9999.ebuild 631 BLAKE2B a35e25dd19e6280ba002ea71274d10105f0ed40b43d2aab2a89db0a6c496b1c04068cebc5874533e2f1c6adb7e7dd711f92d2004d0a7b7abf9fae6b869b4104c SHA512 6ca56c0b03b28cfde6aae740c77481ff3b7c9cf4e21de0753f5e6784af4db43563165e369af15ba3c718d525bcbdf86ada545b80da4597fea557f91abb5e1d94
+EBUILD interactive_marker_tutorials-0.11.0.ebuild 633 BLAKE2B 11790e80f74374ce6b8c1503b947f835d3d57ff0fa39bc61cd661c65e0719377ace891a2554b76cc83aaf11e9a318dc93554cc3e98fa987a914408ba0f62ccac SHA512 28dbc688f4a36be4461942f7c395d66d546939e2f4bcc9f2c317ad6a86c6f64e6898e9f717262f1aeba2e94776cce5118c6bb0fafd6ae87e5ca91a3781707441
+EBUILD interactive_marker_tutorials-9999.ebuild 633 BLAKE2B 11790e80f74374ce6b8c1503b947f835d3d57ff0fa39bc61cd661c65e0719377ace891a2554b76cc83aaf11e9a318dc93554cc3e98fa987a914408ba0f62ccac SHA512 28dbc688f4a36be4461942f7c395d66d546939e2f4bcc9f2c317ad6a86c6f64e6898e9f717262f1aeba2e94776cce5118c6bb0fafd6ae87e5ca91a3781707441
MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3-r1.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3-r1.ebuild
deleted file mode 100644
index 6844281b86eb..000000000000
--- a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Interactive marker tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/interactive_markers
- dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/tf[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.11.0.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.11.0.ebuild
index 19ee9324c9d7..09550f44685e 100644
--- a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.11.0.ebuild
+++ b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.11.0.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -17,10 +16,12 @@ IUSE=""
RDEPEND="
dev-ros/roscpp
dev-ros/interactive_markers
- dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
dev-ros/tf[${PYTHON_USEDEP}]
dev-ros/rospy[${PYTHON_USEDEP}]
dev-ros/roslib[${PYTHON_USEDEP}]
dev-libs/boost:=
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild
index 6844281b86eb..09550f44685e 100644
--- a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild
+++ b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -17,10 +16,12 @@ IUSE=""
RDEPEND="
dev-ros/roscpp
dev-ros/interactive_markers
- dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
dev-ros/tf[${PYTHON_USEDEP}]
dev-ros/rospy[${PYTHON_USEDEP}]
dev-ros/roslib[${PYTHON_USEDEP}]
dev-libs/boost:=
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/interval_intersection/Manifest b/dev-ros/interval_intersection/Manifest
index 12e87b86a649..3a23415d8b59 100644
--- a/dev-ros/interval_intersection/Manifest
+++ b/dev-ros/interval_intersection/Manifest
@@ -1,5 +1,5 @@
AUX gcc6.patch 1465 BLAKE2B e66648e673f2e80f2033171615a829772ad33c3d382da15ae73195510c1e5f4e5cc11793c87d5619443189d582401d32eaa4e96419b2d678d73b10ff4dffae81 SHA512 b2f5d80bce8c15b9636a57c56a83dc1b7f57463fe398b67436584e9790e6548b600c92b2921c624c3eafb590565db7eb17518b748dfd8d2bb440501e9e2c885d
DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD interval_intersection-0.10.14.ebuild 799 BLAKE2B f47aa7e6158befa4e67c3e3e0852f83b1115ba4f9c6ff93f5fde97c2375cc941f40b1f6d6420fb33c999f2ad2979ad03c6d686e3c3167b8598b5becc5607eb92 SHA512 bc7c81d318fc6d7d0c4534721837f8909472c3c0f959c777b612da39af43791688ee3987e69bacb2cef7e8b2484f270e01f21be92baaf23070196aa39892dc0d
-EBUILD interval_intersection-9999.ebuild 762 BLAKE2B 29ee105746802b9b5297a62eec1d51edcd04bf99d459febd1848a81ee83b92bded8e56ca93335f6bc6f83381c40cf55f6750e8022358f36f1e6026a52b7c26fe SHA512 7d677353eeb5f99337aad8f0d8606ffe557d52b08874707bdeb8084fe8ae13fbe3844a21edd06bd39c339ac8ab7354de0b7397cfe07c0d4f1c3924a3941922cb
+EBUILD interval_intersection-0.10.14.ebuild 703 BLAKE2B c09471f568311ab67b002706f066f73cc93bd7cb910f15ea7ca294925697925dddbc194c479a0df64bf97478d940c97a9e6ad4ee188230eae1bbeec5cb68b6cc SHA512 19f72f184ea888a0da8c55a40e7088a74df312ca618c10d1df875f872643aa107ef6e1cff25fdbcadda3627acfc36858dc4590e0a7898198fb6715857cb3b512
+EBUILD interval_intersection-9999.ebuild 703 BLAKE2B c09471f568311ab67b002706f066f73cc93bd7cb910f15ea7ca294925697925dddbc194c479a0df64bf97478d940c97a9e6ad4ee188230eae1bbeec5cb68b6cc SHA512 19f72f184ea888a0da8c55a40e7088a74df312ca618c10d1df875f872643aa107ef6e1cff25fdbcadda3627acfc36858dc4590e0a7898198fb6715857cb3b512
MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild b/dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild
index e814990288f3..84f4c391c2e3 100644
--- a/dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild
+++ b/dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
CATKIN_HAS_MESSAGES=yes
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
inherit ros-catkin
-DESCRIPTION="Tools for calculating the intersection of interval messages coming in on several topics"
+DESCRIPTION="Tools for calculating the intersection of interval messages"
LICENSE="BSD"
SLOT="0"
IUSE=""
@@ -19,12 +18,11 @@ IUSE=""
RDEPEND="
dev-libs/boost:=[threads]
dev-ros/actionlib
- dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/rosconsole
dev-ros/roscpp
dev-ros/roscpp_serialization
dev-ros/rostime
"
DEPEND="${RDEPEND}
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/interval_intersection/interval_intersection-9999.ebuild b/dev-ros/interval_intersection/interval_intersection-9999.ebuild
index bf87d040c0f6..84f4c391c2e3 100644
--- a/dev-ros/interval_intersection/interval_intersection-9999.ebuild
+++ b/dev-ros/interval_intersection/interval_intersection-9999.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
CATKIN_HAS_MESSAGES=yes
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
inherit ros-catkin
-DESCRIPTION="Tools for calculating the intersection of interval messages coming in on several topics"
+DESCRIPTION="Tools for calculating the intersection of interval messages"
LICENSE="BSD"
SLOT="0"
IUSE=""
@@ -19,11 +18,11 @@ IUSE=""
RDEPEND="
dev-libs/boost:=[threads]
dev-ros/actionlib
- dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/rosconsole
dev-ros/roscpp
dev-ros/roscpp_serialization
dev-ros/rostime
"
DEPEND="${RDEPEND}
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? ( dev-cpp/gtest )"
diff --git a/dev-ros/joint_limits_interface/Manifest b/dev-ros/joint_limits_interface/Manifest
index bac26d96391e..bade31ecf00a 100644
--- a/dev-ros/joint_limits_interface/Manifest
+++ b/dev-ros/joint_limits_interface/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD joint_limits_interface-0.14.2.ebuild 490 BLAKE2B 28b4f9b3a31ad18ce69dd4a22115725cda506148bf8e5095ccc3e9bb81a070742245fef113669e98a4b227c14b35ea8e63c94d7f1c303f50518065f9e67ec9aa SHA512 e578f1fc6e23f69746cd3df192d2b28d5e96024fbef7fa9ffd3aaf538516e5ce62c22e0f7bc84473e3daf4f8aaa0d0e65a940994236e4b6bcb726786367ee114
-EBUILD joint_limits_interface-0.15.0.ebuild 490 BLAKE2B 28b4f9b3a31ad18ce69dd4a22115725cda506148bf8e5095ccc3e9bb81a070742245fef113669e98a4b227c14b35ea8e63c94d7f1c303f50518065f9e67ec9aa SHA512 e578f1fc6e23f69746cd3df192d2b28d5e96024fbef7fa9ffd3aaf538516e5ce62c22e0f7bc84473e3daf4f8aaa0d0e65a940994236e4b6bcb726786367ee114
-EBUILD joint_limits_interface-0.15.1.ebuild 487 BLAKE2B f2b06422bdab4950e663c26b8af1c4d28f1d4f61923a36184ce4741389a2e19c6fac576f04b60e17e1dbf4fc90c0b249157f36b32951dc54b94f7e6415610d1f SHA512 56670bed7d830973ad3c565040bc7743800980d78937137df1ccbe0a44a449fa24fca73130dd9965460895341f8b79a2126605e44eaa744ae6bf8e08f2afcd2c
-EBUILD joint_limits_interface-9999.ebuild 490 BLAKE2B a26744ba31855f5d0cd31e84491a137532818a465b22d9df958d0ad94f97a43b11f8a3046ca124f8a4b93a1dc48aabbdd3428cf1c0c50d9fd59ca9b2a4ff9a03 SHA512 41ca8984579c77512c5aa03228b1326482ae9a2a68c64feec168f9bb06e884e802d49c50073777571f955ec19941de6b60129e96f6ebbade73da03d48936518c
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD joint_limits_interface-0.19.1.ebuild 459 BLAKE2B 2a862ccf4d0d98609ddb320d5db99cc6e20007126fe733b05d9948b2eb9784ebd52fe7b587a793128beccbeb1438e325e110e41666f6e798df0ec55592bd835a SHA512 5802d51db31f876e023474bad910e680c4e0cf563dc6d4c29d8cdb85dc948fdf27398a068eb44c6d7b2be0469ded5f1ffc218d4f377f078dc2c4a5a1ff0a672e
+EBUILD joint_limits_interface-9999.ebuild 459 BLAKE2B 2a862ccf4d0d98609ddb320d5db99cc6e20007126fe733b05d9948b2eb9784ebd52fe7b587a793128beccbeb1438e325e110e41666f6e798df0ec55592bd835a SHA512 5802d51db31f876e023474bad910e680c4e0cf563dc6d4c29d8cdb85dc948fdf27398a068eb44c6d7b2be0469ded5f1ffc218d4f377f078dc2c4a5a1ff0a672e
MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.14.2.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.14.2.ebuild
deleted file mode 100644
index 9f9f5afce787..000000000000
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.14.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Interface for enforcing joint limits"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/hardware_interface
- dev-libs/urdfdom
- dev-ros/urdf
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest dev-cpp/gtest )"
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.15.0.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.15.0.ebuild
deleted file mode 100644
index 9f9f5afce787..000000000000
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.15.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Interface for enforcing joint limits"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/hardware_interface
- dev-libs/urdfdom
- dev-ros/urdf
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest dev-cpp/gtest )"
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.15.1.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.15.1.ebuild
deleted file mode 100644
index af15ec2bb5cc..000000000000
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.15.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Interface for enforcing joint limits"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/hardware_interface
- dev-libs/urdfdom
- dev-ros/urdf
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest dev-cpp/gtest )"
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.19.1.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.19.1.ebuild
new file mode 100644
index 000000000000..eb114c5f1349
--- /dev/null
+++ b/dev-ros/joint_limits_interface/joint_limits_interface-0.19.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Interface for enforcing joint limits"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/hardware_interface
+ dev-libs/urdfdom
+ dev-ros/urdf
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest dev-cpp/gtest )"
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild
index c8529d171588..eb114c5f1349 100644
--- a/dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild
+++ b/dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-controls/ros_control"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/joint_state_publisher/Manifest b/dev-ros/joint_state_publisher/Manifest
index 1a3e27cb6568..f8f99a83dbc4 100644
--- a/dev-ros/joint_state_publisher/Manifest
+++ b/dev-ros/joint_state_publisher/Manifest
@@ -1,6 +1,4 @@
-DIST joint_state_publisher-1.12.13.tar.gz 20658 BLAKE2B 8f0d4b1bbe5e381cb20476461a132510e0eed0cde6564557bbcf4d3c07f9036b55fb1b8ea26ef55e0085dfd2f32705d6d4d25b35c915e349c62da17e755b65c1 SHA512 012e2c4b522c9314169323066e3975d72597783a587192a176cc7f7c4b0d59a1dfd3724a57c80d6d6a628640130d235fb9fc8620f0abcd8ef81776689d05e8f1
-DIST robot_model-1.12.11.tar.gz 277822 BLAKE2B 3bdd2b931ddfd062594ccb2be4ce6d4863a5fa66f538c3ee48c3600b3be249d267f9d03aa9a701bc6ab22c4297d659a24da668fedcd25c75fe128c43cc781be0 SHA512 8dea6fc72e9beaddbf9a82cb177561cb89c69ef8f58f0c4882598f6cc33a0e10564d9696f07b6f4e3e3404d3f1f5236e54eea4b8d249be0a216cd3ce12a03cde
-EBUILD joint_state_publisher-1.12.11.ebuild 532 BLAKE2B a37038eb7f2a6d9a3ac4ea08518b6290d08c0248f470c6884dcf87e4fa3b0c5d1f15d0ca614a3b9436dd15bc397a3f56f7eb3c9ecd5f99e2d8ab0abca9ae64ad SHA512 b0126544edc2e736160a1e1967fb587c48aab8341fbb0fde41aa2adccafb123b19816b6d7d42bc60058835326f6a77677df481daf5328f655516971549357df1
-EBUILD joint_state_publisher-1.12.13.ebuild 606 BLAKE2B c1cf841a267a048cf82380760372b47e8644bc3465df1fe41f1ab501da55de5ce333a1c50a18cd0690aae5e7555df2601ed79ab7e0ed033171e04a40c778bf97 SHA512 842ae750a98a69b4c4bea0912ea37c182f20226cf6d681b32f6cd784440d85d61f4800a97867fbd6b85f4a6cf76605acb74c604d9cf4d07e690308f82c982f1e
-EBUILD joint_state_publisher-9999.ebuild 606 BLAKE2B c1cf841a267a048cf82380760372b47e8644bc3465df1fe41f1ab501da55de5ce333a1c50a18cd0690aae5e7555df2601ed79ab7e0ed033171e04a40c778bf97 SHA512 842ae750a98a69b4c4bea0912ea37c182f20226cf6d681b32f6cd784440d85d61f4800a97867fbd6b85f4a6cf76605acb74c604d9cf4d07e690308f82c982f1e
+DIST joint_state_publisher-1.15.0.tar.gz 27974 BLAKE2B e0293f3c9496dfa47bd07e9825ed399e05b53f80947aecba228c3b153384fe5ceef808fa7a1ff5678448ef263c439bbcdae4e475bee206554f2cdff785175b1a SHA512 58387785f93195ab4b1f6a2d54f8d7765c5cd34df6a2bf5ab00caf032b5b1093fc9ec02e7217cd554cdcc37545295dff5652c295fb3ea91a549d23b83db02dbc
+EBUILD joint_state_publisher-1.15.0.ebuild 530 BLAKE2B 4cfecaf5f5b50e4e54e67b95ce43cd63880ff107fa357e843b3b61bc89286c7385c078840165469df8c3b59039e48c5c0a6caff6ac8e1bad3ea9c627d8a3e841 SHA512 253596456e274bc4482bc2f76eb29bde5728fc7689e6be16411f6625986dcc5ffda11f044c10b58bea6f890973147459c56c8e20f1186032d33df1db7ec885fa
+EBUILD joint_state_publisher-9999.ebuild 530 BLAKE2B 4cfecaf5f5b50e4e54e67b95ce43cd63880ff107fa357e843b3b61bc89286c7385c078840165469df8c3b59039e48c5c0a6caff6ac8e1bad3ea9c627d8a3e841 SHA512 253596456e274bc4482bc2f76eb29bde5728fc7689e6be16411f6625986dcc5ffda11f044c10b58bea6f890973147459c56c8e20f1186032d33df1db7ec885fa
MISC metadata.xml 339 BLAKE2B b435f6689ab4c75a5dc4850793e70300e465c96c90b6162eaf488a069eb259e282f2534300ae1388036ba77058df57d8d43a4c60bdc1c336e1f3901a4d8bbb4e SHA512 44432f918f72fd087c1747bf5b42743651c6cf5a457c3d9cfc25206dbf24396b09b3565118895c6e1794befd027db1842dc7fd33f3e74031e0ba74be72475df1
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.11.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-1.12.11.ebuild
deleted file mode 100644
index 7a7a68e62676..000000000000
--- a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/python_qt_binding[${PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.13.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-1.12.13.ebuild
deleted file mode 100644
index 5f4325158a53..000000000000
--- a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/joint_state_publisher"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/python_qt_binding[${PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${DEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-1.15.0.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-1.15.0.ebuild
new file mode 100644
index 000000000000..fc248b3b5af7
--- /dev/null
+++ b/dev-ros/joint_state_publisher/joint_state_publisher-1.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/joint_state_publisher"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${DEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild
index 5f4325158a53..fc248b3b5af7 100644
--- a/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild
+++ b/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/joint_state_publisher"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -17,7 +16,6 @@ IUSE=""
DEPEND=""
RDEPEND="${DEPEND}
dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/python_qt_binding[${PYTHON_USEDEP}]
dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
"
DEPEND="${DEPEND}
diff --git a/dev-ros/joint_state_publisher_gui/Manifest b/dev-ros/joint_state_publisher_gui/Manifest
new file mode 100644
index 000000000000..fcdd764a57f3
--- /dev/null
+++ b/dev-ros/joint_state_publisher_gui/Manifest
@@ -0,0 +1,4 @@
+DIST joint_state_publisher-1.15.0.tar.gz 27974 BLAKE2B e0293f3c9496dfa47bd07e9825ed399e05b53f80947aecba228c3b153384fe5ceef808fa7a1ff5678448ef263c439bbcdae4e475bee206554f2cdff785175b1a SHA512 58387785f93195ab4b1f6a2d54f8d7765c5cd34df6a2bf5ab00caf032b5b1093fc9ec02e7217cd554cdcc37545295dff5652c295fb3ea91a549d23b83db02dbc
+EBUILD joint_state_publisher_gui-1.15.0.ebuild 569 BLAKE2B b3f96f57c3b55ff43fc83eb18b118d3152486e7ab417da4dd3c050d0e8983d0801cdcf8a221745e48bde25d34097d9d6bf2d43bd871c7c9ff7e81e171c6eb0ae SHA512 e3eda9bda00216a16d8a4c98a2afa24e291b57b016a813e1a1f2e26f00af28743373db574f01474a9514acac70dc0cc7a9f7c25d9275233f2c593b464cca5cbf
+EBUILD joint_state_publisher_gui-9999.ebuild 569 BLAKE2B b3f96f57c3b55ff43fc83eb18b118d3152486e7ab417da4dd3c050d0e8983d0801cdcf8a221745e48bde25d34097d9d6bf2d43bd871c7c9ff7e81e171c6eb0ae SHA512 e3eda9bda00216a16d8a4c98a2afa24e291b57b016a813e1a1f2e26f00af28743373db574f01474a9514acac70dc0cc7a9f7c25d9275233f2c593b464cca5cbf
+MISC metadata.xml 339 BLAKE2B b435f6689ab4c75a5dc4850793e70300e465c96c90b6162eaf488a069eb259e282f2534300ae1388036ba77058df57d8d43a4c60bdc1c336e1f3901a4d8bbb4e SHA512 44432f918f72fd087c1747bf5b42743651c6cf5a457c3d9cfc25206dbf24396b09b3565118895c6e1794befd027db1842dc7fd33f3e74031e0ba74be72475df1
diff --git a/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-1.15.0.ebuild b/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-1.15.0.ebuild
new file mode 100644
index 000000000000..5ee91bc12a4d
--- /dev/null
+++ b/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-1.15.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/joint_state_publisher"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/python_qt_binding[${PYTHON_USEDEP}]
+ dev-ros/joint_state_publisher[${PYTHON_USEDEP}]
+"
+DEPEND="${DEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-9999.ebuild b/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-9999.ebuild
new file mode 100644
index 000000000000..5ee91bc12a4d
--- /dev/null
+++ b/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/joint_state_publisher"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/python_qt_binding[${PYTHON_USEDEP}]
+ dev-ros/joint_state_publisher[${PYTHON_USEDEP}]
+"
+DEPEND="${DEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/joint_state_publisher_gui/metadata.xml b/dev-ros/joint_state_publisher_gui/metadata.xml
new file mode 100644
index 000000000000..b74086ddd5fa
--- /dev/null
+++ b/dev-ros/joint_state_publisher_gui/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ ros@gentoo.org
+ Gentoo ROS Project
+
+
+ ros/joint_state_publisher
+
+
diff --git a/dev-ros/joint_states_settler/Manifest b/dev-ros/joint_states_settler/Manifest
index b7bd2e9ecb2e..84a9bca1acf8 100644
--- a/dev-ros/joint_states_settler/Manifest
+++ b/dev-ros/joint_states_settler/Manifest
@@ -1,5 +1,5 @@
AUX gcc6.patch 459 BLAKE2B eadc7eb78eb79bff30535776516bed691354706192fe196107efd319b357f8b0c361bbd70492f37525137c78399954681e4ab8eaf48cfe71903785b5f889765a SHA512 dca02dec9e53395941bcb263d88b3a96ef1437315431d242ffcfa7768a2b0c4d5ec394db5c7e7d2dbe46750264adce5e7032caa207e912ec7dedbcad9c345519
DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD joint_states_settler-0.10.14.ebuild 718 BLAKE2B e90530b8f4dfda9d1bf58c4cbd0607ccaca091185295b2621b663ebe935091ee3eecf57a1e09b793270a277dce9c43fcddfa2a6a01aa854adefbbf0bb838f46a SHA512 c9c98be65b64f19dd98f41008226d442333be2cf1fe6d118c7813b6fb77b5aeb3832a50c6f45ab12057cc0a8d324c3b0ae6ca8d05704f88e1007bddf13ff637a
-EBUILD joint_states_settler-9999.ebuild 718 BLAKE2B e90530b8f4dfda9d1bf58c4cbd0607ccaca091185295b2621b663ebe935091ee3eecf57a1e09b793270a277dce9c43fcddfa2a6a01aa854adefbbf0bb838f46a SHA512 c9c98be65b64f19dd98f41008226d442333be2cf1fe6d118c7813b6fb77b5aeb3832a50c6f45ab12057cc0a8d324c3b0ae6ca8d05704f88e1007bddf13ff637a
+EBUILD joint_states_settler-0.10.14.ebuild 687 BLAKE2B ca49fdac8f22a82f488be34d395b5241744a081de3b355ee4f1e5489a4b8cffb73666e5a6a96013e83a0af7fe04cb97f513551255bab56e7d69a9af337b90dba SHA512 d6caff6e951ffc4f5fa424e7f2ed702172ce20d502b9d45c52052bfea92d29ff8c1588a69aed46bc2aec999d4a54a305fddbbb6b05d5e95621f91c62b4123173
+EBUILD joint_states_settler-9999.ebuild 687 BLAKE2B ca49fdac8f22a82f488be34d395b5241744a081de3b355ee4f1e5489a4b8cffb73666e5a6a96013e83a0af7fe04cb97f513551255bab56e7d69a9af337b90dba SHA512 d6caff6e951ffc4f5fa424e7f2ed702172ce20d502b9d45c52052bfea92d29ff8c1588a69aed46bc2aec999d4a54a305fddbbb6b05d5e95621f91c62b4123173
MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/joint_states_settler/joint_states_settler-0.10.14.ebuild b/dev-ros/joint_states_settler/joint_states_settler-0.10.14.ebuild
index f0900cf7e7c1..e7359f7341dc 100644
--- a/dev-ros/joint_states_settler/joint_states_settler-0.10.14.ebuild
+++ b/dev-ros/joint_states_settler/joint_states_settler-0.10.14.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
@@ -22,9 +21,9 @@ RDEPEND="
dev-ros/roscpp
dev-ros/roscpp_serialization
dev-ros/settlerlib
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
DEPEND="${RDEPEND}
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? ( dev-cpp/gtest )"
PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/joint_states_settler/joint_states_settler-9999.ebuild b/dev-ros/joint_states_settler/joint_states_settler-9999.ebuild
index f0900cf7e7c1..e7359f7341dc 100644
--- a/dev-ros/joint_states_settler/joint_states_settler-9999.ebuild
+++ b/dev-ros/joint_states_settler/joint_states_settler-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
@@ -22,9 +21,9 @@ RDEPEND="
dev-ros/roscpp
dev-ros/roscpp_serialization
dev-ros/settlerlib
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
DEPEND="${RDEPEND}
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? ( dev-cpp/gtest )"
PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/kdl_conversions/Manifest b/dev-ros/kdl_conversions/Manifest
index bcac5e098854..c2c1aeea8249 100644
--- a/dev-ros/kdl_conversions/Manifest
+++ b/dev-ros/kdl_conversions/Manifest
@@ -1,6 +1,4 @@
-DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
-DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
-EBUILD kdl_conversions-1.11.9-r1.ebuild 459 BLAKE2B b4ed7de2be0f7478e1b563a1be7ec605dbaf5c9dd597380b90986edbe80fb064d167b15366134a6be0492d3403249d66923156c2244837ff179165333b794992 SHA512 e28526275022de0f203d20d745b713ea880859f5066b6f719c589009a15ab0a8550ba562c59384636b383a3bd8149015e6f452259c1c1849b483ef86065eae24
-EBUILD kdl_conversions-1.12.0.ebuild 459 BLAKE2B b4ed7de2be0f7478e1b563a1be7ec605dbaf5c9dd597380b90986edbe80fb064d167b15366134a6be0492d3403249d66923156c2244837ff179165333b794992 SHA512 e28526275022de0f203d20d745b713ea880859f5066b6f719c589009a15ab0a8550ba562c59384636b383a3bd8149015e6f452259c1c1849b483ef86065eae24
-EBUILD kdl_conversions-9999.ebuild 459 BLAKE2B b4ed7de2be0f7478e1b563a1be7ec605dbaf5c9dd597380b90986edbe80fb064d167b15366134a6be0492d3403249d66923156c2244837ff179165333b794992 SHA512 e28526275022de0f203d20d745b713ea880859f5066b6f719c589009a15ab0a8550ba562c59384636b383a3bd8149015e6f452259c1c1849b483ef86065eae24
+DIST geometry-1.13.2.tar.gz 188225 BLAKE2B b08e78b298c94c38baa5d25a878be703d7d3a310277b66690b9fe4da1d0cd3f9083cf3bf6dc1d59149599b6fb0ec10feaf668206da245ed7e0cb9cf1878b620c SHA512 504de0e7ebf1dd73e918ab4fa39967cc9e39a53d487072430106b391d669ddfc7e530b66b38f4f73d1787e4a73acdad8e707c6757afe2e235157d4aa19f28af2
+EBUILD kdl_conversions-1.13.2.ebuild 457 BLAKE2B 3e37a3425bc20769848aeefda3d4aa9968f5589e336307a29eb475da87346ac20165043ad82c8a47e2e6b39d3e933d40d256e78907b2ff485769138159b9b2a4 SHA512 24448d5e96234ec5788877288f9f18f7fdae6f79a50a55843b7669eed23c05b25c0f224825f96005bc3d67423eb953d720cdca16520ecf54d9c63185e5dcbded
+EBUILD kdl_conversions-9999.ebuild 457 BLAKE2B 3e37a3425bc20769848aeefda3d4aa9968f5589e336307a29eb475da87346ac20165043ad82c8a47e2e6b39d3e933d40d256e78907b2ff485769138159b9b2a4 SHA512 24448d5e96234ec5788877288f9f18f7fdae6f79a50a55843b7669eed23c05b25c0f224825f96005bc3d67423eb953d720cdca16520ecf54d9c63185e5dcbded
MISC metadata.xml 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/kdl_conversions/kdl_conversions-1.11.9-r1.ebuild b/dev-ros/kdl_conversions/kdl_conversions-1.11.9-r1.ebuild
deleted file mode 100644
index 0f4679e87a71..000000000000
--- a/dev-ros/kdl_conversions/kdl_conversions-1.11.9-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Conversion functions between KDL and geometry_msgs types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- sci-libs/orocos_kdl:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/kdl_conversions/kdl_conversions-1.12.0.ebuild b/dev-ros/kdl_conversions/kdl_conversions-1.12.0.ebuild
deleted file mode 100644
index 0f4679e87a71..000000000000
--- a/dev-ros/kdl_conversions/kdl_conversions-1.12.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Conversion functions between KDL and geometry_msgs types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- sci-libs/orocos_kdl:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/kdl_conversions/kdl_conversions-1.13.2.ebuild b/dev-ros/kdl_conversions/kdl_conversions-1.13.2.ebuild
new file mode 100644
index 000000000000..3c146229a0cd
--- /dev/null
+++ b/dev-ros/kdl_conversions/kdl_conversions-1.13.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Conversion functions between KDL and geometry_msgs types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ sci-libs/orocos_kdl:=
+"
+DEPEND="${RDEPEND}
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/kdl_conversions/kdl_conversions-9999.ebuild b/dev-ros/kdl_conversions/kdl_conversions-9999.ebuild
index 0f4679e87a71..3c146229a0cd 100644
--- a/dev-ros/kdl_conversions/kdl_conversions-9999.ebuild
+++ b/dev-ros/kdl_conversions/kdl_conversions-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/geometry"
KEYWORDS="~amd64 ~arm"
@@ -15,7 +15,8 @@ SLOT="0"
IUSE=""
RDEPEND="
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
sci-libs/orocos_kdl:=
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/laser_cb_detector/Manifest b/dev-ros/laser_cb_detector/Manifest
index a73b200b3d34..550be3a3b91f 100644
--- a/dev-ros/laser_cb_detector/Manifest
+++ b/dev-ros/laser_cb_detector/Manifest
@@ -2,6 +2,6 @@ AUX boost170.patch 539 BLAKE2B 02288b4d5c3de5ef4290ce7ba4f8c46c95148ea2417c172f0
AUX gcc6.patch 461 BLAKE2B 2e745eb80783777fb510d763b1c3119e8fb89f2a7defd9a3a62ed902c9f9a5fcf973b032281049499aa7ea4b36569c5cba72ea89d74040580a8a06a2b99d2f5d SHA512 122b897b905cd9212f038887d23c6a4c9648bcdcf64231b400fcaff7aa7c3a4c731ede2d6d69d85949ca20905a3b166451bb4de7a9ad09b3ffc9b94eb2959702
AUX ocv4.patch 597 BLAKE2B 0b87de52c3a2fed94c32c47500a69f79d6d6861b5881d5ba357aeb9924be8356b204ceaf7ae9e14055048e7ddc6fb74751cadfd7a6e275b4115e793c5723f007 SHA512 711c26a8539facf376686e619c4a90cc77ae26480f3754edf5b04f0a14aaa861f14d58b19172e37fb4e501eb92883ff4173ae93d8ec5b31379eefb4a0fb2c1a1
DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD laser_cb_detector-0.10.14.ebuild 779 BLAKE2B 9a79d3cc8112ff1d5d6d3eb4e41f5a38c494a60270aa44957667dc9f2673d72aaa3003a55643b8d7a56032f496a118c7575395458a5802baa5cc6d06cb7a2bf1 SHA512 34593b76cbf879b9c04ec3d14be9e7f6467302a7d19d347cb2e2d21c6977ae2bd9a635bff5012b35c0ac2b5ee6c996b75d9652c2322969d0d777147837f09d6f
-EBUILD laser_cb_detector-9999.ebuild 728 BLAKE2B c5a0e74981b25cacf9618ec4cba8fd7a7d1088f7a9243e0b5ecd005a7737204ce3ea9a1b8bc8bf63b33d3449d099275ed8c3f029a5b93cdcba9f08aafb04a9c0 SHA512 be9fb0ab225811f6878fca22af77defde55502875dee2c9eba8ecb56b9bf34885260552f1568b432c1e51ae277b17983fdbbbc98650e0884de0e99d9de14b1f4
+EBUILD laser_cb_detector-0.10.14.ebuild 751 BLAKE2B 2e7c27819b18f4dd992928858811543990c1d5d7ddf21b805efe0b85df3d2a131fe4ea5e65f08b3bed8a97357d864dede5010470b3b366c713769458ec32ff0b SHA512 0e10d9ee2506420fc35fb9971b2faac5ed68002d65eb0403d44c2898422d9c2b479c2aefb515f420875e91c41df7e61f2ba7a56e0a447c9aeaa8818eb92e0576
+EBUILD laser_cb_detector-9999.ebuild 751 BLAKE2B 2e7c27819b18f4dd992928858811543990c1d5d7ddf21b805efe0b85df3d2a131fe4ea5e65f08b3bed8a97357d864dede5010470b3b366c713769458ec32ff0b SHA512 0e10d9ee2506420fc35fb9971b2faac5ed68002d65eb0403d44c2898422d9c2b479c2aefb515f420875e91c41df7e61f2ba7a56e0a447c9aeaa8818eb92e0576
MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
index 6a7531529b40..7d0db5acd0fa 100644
--- a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
index 605a596b776e..7d0db5acd0fa 100644
--- a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
@@ -27,4 +26,4 @@ RDEPEND="
dev-ros/settlerlib
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/librviz_tutorial/Manifest b/dev-ros/librviz_tutorial/Manifest
index 883e60956253..8b8a801d34fe 100644
--- a/dev-ros/librviz_tutorial/Manifest
+++ b/dev-ros/librviz_tutorial/Manifest
@@ -1,10 +1,4 @@
-DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
-DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
-DIST visualization_tutorials-0.10.3.tar.gz 428877 BLAKE2B 4bcd482ae61f29908ca23dda653d1c6d0e6a0a9df56df8343d1dfb5124f8d60c9a12ef8b1565c4655617dcd62d80a2aa51f2fd9b2c5329e33c3cc22e3e63c22d SHA512 2e484791851291d2316c7a20e92d988d71b6c41c98bad98c78bed465069dcfe5fc1ddd5c15c6981e951db2c114e965747c07e27f4851c2705af3dd036b992781
DIST visualization_tutorials-0.11.0.tar.gz 429489 BLAKE2B d4558a15b696ba05ed156a64ab2c0ad7229314f73d2823c0a46f53132801619d28fc5c68f5d8e0f3e2cadb7bb5078b3518da87ea18940432760b20bddeda578d SHA512 78ebe536a3a209fb0c61fb7dbc0aa115b5f4e6297303b1fc03740402decea719077037a90f4c45a0f6ece95e3578d6dad1095a0b1f0a90c136b738d0350aac9b
-EBUILD librviz_tutorial-0.10.1.ebuild 458 BLAKE2B 1e6cba7a4fece4d4c82e809a51b93ad1f10aa073d006c1f7df851d2d1343d9b47de412d96f18b65ef25cfaca5985fa50c5f12d21dc253d74e0625cc8b8a7c420 SHA512 c93eedc30fade27d4d85dda547b49566227517b729ede7503b5334b549ba549cccfc700249cd2da6636ad1413765a5a491f0348e39c5649985e152162adc48a8
-EBUILD librviz_tutorial-0.10.2.ebuild 458 BLAKE2B 3ee42f59d025c0fb9a8adaf3b1355f78aa8c7ba82f5f779691a4c15f2362791e15d88f3271d902bad059eb3ee59619e496a1f7dc12745cf1f3926840f33436a1 SHA512 b86dbc8b4d38f91faad5771afd1f769af6123e83258c56a5c6502f1a6259194ad9c3c61d219499fa4df4ac79c61fddd5d4155a4ce941d0548b86e15f075168c8
-EBUILD librviz_tutorial-0.10.3.ebuild 458 BLAKE2B 3ee42f59d025c0fb9a8adaf3b1355f78aa8c7ba82f5f779691a4c15f2362791e15d88f3271d902bad059eb3ee59619e496a1f7dc12745cf1f3926840f33436a1 SHA512 b86dbc8b4d38f91faad5771afd1f769af6123e83258c56a5c6502f1a6259194ad9c3c61d219499fa4df4ac79c61fddd5d4155a4ce941d0548b86e15f075168c8
-EBUILD librviz_tutorial-0.11.0.ebuild 455 BLAKE2B 0a8624b7b7f0b31d40c2de264f5cb703108ca1ed87d619664ee0da880f95a1edf41d9e50a83178eb633d15256655d647169026b3d6344cacb6eae0bb2a8a85c0 SHA512 5579cc9ae941d0845ab42153c95b0376c065a1e2be5fc62b4c93b48389b6dbf94f5fd3c6320bccddd6c4428b11cacfc028d8db74287e8ef283c2e58da3c085fe
-EBUILD librviz_tutorial-9999.ebuild 458 BLAKE2B 1e6cba7a4fece4d4c82e809a51b93ad1f10aa073d006c1f7df851d2d1343d9b47de412d96f18b65ef25cfaca5985fa50c5f12d21dc253d74e0625cc8b8a7c420 SHA512 c93eedc30fade27d4d85dda547b49566227517b729ede7503b5334b549ba549cccfc700249cd2da6636ad1413765a5a491f0348e39c5649985e152162adc48a8
+EBUILD librviz_tutorial-0.11.0.ebuild 446 BLAKE2B 2f7ef79f088ba7d0c4ae24cc8d749304e4cb9ef5941aa593933f2ad91876a283534eebc1acd65162c2720ca15d958c6db1196cc66c95eaed3417064028e8c569 SHA512 4a2ec58abe7fda27121906e6a55ba919f6c209871939ff9a0e96a38db2069faf88d014339275fb9b30f912204827a4e443dea16117defa220dbc0a4118b3cbd6
+EBUILD librviz_tutorial-9999.ebuild 446 BLAKE2B 2f7ef79f088ba7d0c4ae24cc8d749304e4cb9ef5941aa593933f2ad91876a283534eebc1acd65162c2720ca15d958c6db1196cc66c95eaed3417064028e8c569 SHA512 4a2ec58abe7fda27121906e6a55ba919f6c209871939ff9a0e96a38db2069faf88d014339275fb9b30f912204827a4e443dea16117defa220dbc0a4118b3cbd6
MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/librviz_tutorial/librviz_tutorial-0.10.1.ebuild b/dev-ros/librviz_tutorial/librviz_tutorial-0.10.1.ebuild
deleted file mode 100644
index a87a8ddccb99..000000000000
--- a/dev-ros/librviz_tutorial/librviz_tutorial-0.10.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorial showing how to compile your own C++ program with RViz displays and features"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/rviz
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/librviz_tutorial/librviz_tutorial-0.10.2.ebuild b/dev-ros/librviz_tutorial/librviz_tutorial-0.10.2.ebuild
deleted file mode 100644
index dbb62ffac134..000000000000
--- a/dev-ros/librviz_tutorial/librviz_tutorial-0.10.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorial showing how to compile your own C++ program with RViz displays and features"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/rviz
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/librviz_tutorial/librviz_tutorial-0.10.3.ebuild b/dev-ros/librviz_tutorial/librviz_tutorial-0.10.3.ebuild
deleted file mode 100644
index dbb62ffac134..000000000000
--- a/dev-ros/librviz_tutorial/librviz_tutorial-0.10.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorial showing how to compile your own C++ program with RViz displays and features"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/rviz
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/librviz_tutorial/librviz_tutorial-0.11.0.ebuild b/dev-ros/librviz_tutorial/librviz_tutorial-0.11.0.ebuild
index b8d5a83d3174..fa17abc3aed7 100644
--- a/dev-ros/librviz_tutorial/librviz_tutorial-0.11.0.ebuild
+++ b/dev-ros/librviz_tutorial/librviz_tutorial-0.11.0.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="Tutorial showing how to compile your own C++ program with RViz displays and features"
+DESCRIPTION="Tutorial showing how to build a C++ program with RViz displays and features"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/librviz_tutorial/librviz_tutorial-9999.ebuild b/dev-ros/librviz_tutorial/librviz_tutorial-9999.ebuild
index a87a8ddccb99..fa17abc3aed7 100644
--- a/dev-ros/librviz_tutorial/librviz_tutorial-9999.ebuild
+++ b/dev-ros/librviz_tutorial/librviz_tutorial-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="Tutorial showing how to compile your own C++ program with RViz displays and features"
+DESCRIPTION="Tutorial showing how to build a C++ program with RViz displays and features"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/message_filters/Manifest b/dev-ros/message_filters/Manifest
index 91ac651af1dd..901e1e594fdd 100644
--- a/dev-ros/message_filters/Manifest
+++ b/dev-ros/message_filters/Manifest
@@ -1,8 +1,5 @@
-AUX boost.patch 1066 BLAKE2B 955d62df23d3165df5cf2645967755bf8dbd993779ddba0c6db4cbd77c6456d536421d428475ef521f3b961e4e9dd9f93a78066f10ed961fddb6a8528ea29648 SHA512 a78c61c54c7389647fa7001ce0d453b0d2b74324877da1275edc487c18cd6208a640678575887f84bcab0a742618efe69bd209855a4f57f58ede98f0a3cd7600
AUX tests.patch 4837 BLAKE2B 2793652865f2d1f8ce1499b37922e480d40ca3931f098156a6cf541ad48985a3bee29364bb09e37c4f15424765dd057875f26dd5290f5747718538bcbeb3aead SHA512 2c778a7e4c7fc6d89ef162fd42d6f1dbd487d885c7ee04f6a8243142aaf949b02bfcd0c08cc8799f7a1ee95d13c8d21aef340abc4a3e6ca3c0f2231118985796
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD message_filters-1.14.3-r1.ebuild 795 BLAKE2B 294a8f9f9f3d3b47a8a692c86b88badd8370ef38f680e6fb2ed1fbfb027ffe8e20cfdfea63564478488e2b583d5588478330535c458ce7b45383d2e979e3d5cf SHA512 e159086871167df2de97ad0912162f4ac2c94a4e43796d41f8b4a338d1cc8783a094de87497c719d9608d62a2cfa1f31f17fa946a96cb1b01203a8ed47039055
-EBUILD message_filters-1.15.4.ebuild 769 BLAKE2B 1d022886a2dc5110f40e8eec6458687855690d2c5f073a96e936c16172bd20c656d127bf2a76d636dffda664a4431ac943dc4f97a52b9aed0544ff267a721bc5 SHA512 9d9f9dfcc87fa07dd7473710a059d88267ebf55ba84b00d709b0aec7959049a3f0de7cf490fa46d19c330403a168e1114cd99e2a2425bea406228878d1d41cf0
-EBUILD message_filters-9999.ebuild 769 BLAKE2B 1d022886a2dc5110f40e8eec6458687855690d2c5f073a96e936c16172bd20c656d127bf2a76d636dffda664a4431ac943dc4f97a52b9aed0544ff267a721bc5 SHA512 9d9f9dfcc87fa07dd7473710a059d88267ebf55ba84b00d709b0aec7959049a3f0de7cf490fa46d19c330403a168e1114cd99e2a2425bea406228878d1d41cf0
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD message_filters-1.15.7.ebuild 729 BLAKE2B 9d3bc0a6e85e49180b7def2119da87dd9e996e66a884803f80a096db2dc792f2191a5da08667637d5c7a48d95e20dcdff63a06f092cbace216506f2fbf9be1f3 SHA512 2c4113aa5575f345de1060ab0f5fe21f9b55a3e497989fabfb8e5ba0109f8cea4285b06c43f9d0b6da0cde63b27170c09da49063fed4ed4350d7cae652015ba5
+EBUILD message_filters-9999.ebuild 729 BLAKE2B 9d3bc0a6e85e49180b7def2119da87dd9e996e66a884803f80a096db2dc792f2191a5da08667637d5c7a48d95e20dcdff63a06f092cbace216506f2fbf9be1f3 SHA512 2c4113aa5575f345de1060ab0f5fe21f9b55a3e497989fabfb8e5ba0109f8cea4285b06c43f9d0b6da0cde63b27170c09da49063fed4ed4350d7cae652015ba5
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/message_filters/files/boost.patch b/dev-ros/message_filters/files/boost.patch
deleted file mode 100644
index 1acc778756a8..000000000000
--- a/dev-ros/message_filters/files/boost.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 41f18edc9f2f0b1ef304ea25f148bd56a6bf3d70
-Author: Maarten de Vries
-Date: Thu Jan 31 00:58:29 2019 +0100
-
- Remove signals from find_package(Boost COMPONENTS ...) (#1580)
-
- The packages use signals2, not signals. Only boost libraries with
- compiled code should be passed to find_package(Boost COMPONENTS ...),
- and the signals2 library has always been header only.
-
- Boost 1.69 has removed the deprecated signals library, so the otherwise
- useless but harmless `signals` component now breaks the build.
-
-diff --git a/utilities/message_filters/CMakeLists.txt b/utilities/message_filters/CMakeLists.txt
-index 5694ac57e..d2b1477ad 100644
---- a/utilities/message_filters/CMakeLists.txt
-+++ b/utilities/message_filters/CMakeLists.txt
-@@ -13,7 +13,7 @@ catkin_package(
- )
- catkin_python_setup()
-
--find_package(Boost REQUIRED COMPONENTS signals thread)
-+find_package(Boost REQUIRED COMPONENTS thread)
-
- include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
- link_directories(${catkin_LIBRARY_DIRS})
diff --git a/dev-ros/message_filters/message_filters-1.14.3-r1.ebuild b/dev-ros/message_filters/message_filters-1.14.3-r1.ebuild
deleted file mode 100644
index c2ab8b9cdbe7..000000000000
--- a/dev-ros/message_filters/message_filters-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-libs/boost:=[threads]
- dev-ros/genpy[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-cpp/gtest
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/message_filters/message_filters-1.15.4.ebuild b/dev-ros/message_filters/message_filters-1.15.4.ebuild
deleted file mode 100644
index ec6cbf8434ad..000000000000
--- a/dev-ros/message_filters/message_filters-1.15.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-libs/boost:=[threads]
- dev-ros/genpy[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-cpp/gtest
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/message_filters/message_filters-1.15.7.ebuild b/dev-ros/message_filters/message_filters-1.15.7.ebuild
new file mode 100644
index 000000000000..60454dc5f271
--- /dev/null
+++ b/dev-ros/message_filters/message_filters-1.15.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of message filters which take in messages and outputs those at a later time"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosconsole
+ dev-ros/roscpp
+ dev-libs/boost:=[threads]
+ dev-ros/genpy[${PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? (
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-ros/rosunit[${PYTHON_USEDEP}]
+ dev-cpp/gtest
+ dev-python/nose[${PYTHON_USEDEP}]
+ )"
+PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/message_filters/message_filters-9999.ebuild b/dev-ros/message_filters/message_filters-9999.ebuild
index ec6cbf8434ad..60454dc5f271 100644
--- a/dev-ros/message_filters/message_filters-9999.ebuild
+++ b/dev-ros/message_filters/message_filters-9999.ebuild
@@ -1,16 +1,15 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
-DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
+DESCRIPTION="Set of message filters which take in messages and outputs those at a later time"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/monocam_settler/Manifest b/dev-ros/monocam_settler/Manifest
index 568924fbc509..b279ff0326cb 100644
--- a/dev-ros/monocam_settler/Manifest
+++ b/dev-ros/monocam_settler/Manifest
@@ -1,7 +1,4 @@
-AUX gcc6.patch 781 BLAKE2B 1228e588391a8f3d0eff4725c9158ad10378216e7c6df0ba27a270c0e7382352c573901a25014d92e21523f3e31745f59cfea247039d6bb27e45e17ea7caa59b SHA512 c11a41b34f4b0616c3f3aeb68e763f9f10010c0a54a456ff76b3601f2d2608c63a73df069dfe2462a17e4988d9c7913618e4510aa6bec9e2d88a5038840a36f3
-DIST calibration-0.10.13.tar.gz 112305 BLAKE2B 1b2c2ffa0c07b907c7a4dc28b87ff112a497275039be98bcc15ad396ccf525ba4fb717b398551f04dab7131a8085e1b1ec64eb24408c12fec09e9c42b5c40a75 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb
DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD monocam_settler-0.10.13.ebuild 667 BLAKE2B 788a7a39fc5e2453f45b68a573399826e15e29f864d292eae9e71efa4f6b9726b1f52ffd777cb303c11d9bb989fc4506a5146c76e625ea3af3af569fd301c14f SHA512 ed1e0f9639533e50001fed716861a242cfedade9aa5fb1de7742915619a09680afe4df2b021c6c915a93753a63fa72b6607b3dbc7ae7aba59d108e132bb270fa
-EBUILD monocam_settler-0.10.14.ebuild 704 BLAKE2B 379c17f9f5830dde3c8a54914a111462bdd5d2cdb6ee1d6fb3843ffb77eb793da57880c9271e8c19b26eb4e632ca67d3f0a9f850e6c7d79d441b876e0f4568e5 SHA512 8223f50cc033ec063f19a405f442378ea1fef9ba0a340104a2be87cbd0e03a63e99e7ebb636fbcb9d97ec9db21be3f1a05d9e756fe58b1786b6fecf76ec370c3
-EBUILD monocam_settler-9999.ebuild 667 BLAKE2B 788a7a39fc5e2453f45b68a573399826e15e29f864d292eae9e71efa4f6b9726b1f52ffd777cb303c11d9bb989fc4506a5146c76e625ea3af3af569fd301c14f SHA512 ed1e0f9639533e50001fed716861a242cfedade9aa5fb1de7742915619a09680afe4df2b021c6c915a93753a63fa72b6607b3dbc7ae7aba59d108e132bb270fa
+EBUILD monocam_settler-0.10.14.ebuild 636 BLAKE2B e223d623f976fa3dd4d62ea7395574d96a5c886d038d3396ac42330814c8ae09e771020994b94f5edc21758d4d4f96b77d7ca9187263f5820233472d9b3a0aaa SHA512 3111a3eb58676fe8005d44148f1771587b7ee448597d45edeac1f155fb63e4ca21bdb8890d0f1a121bd75e1018f206de0686ca8fa04384a3c5e80e431a57c362
+EBUILD monocam_settler-9999.ebuild 636 BLAKE2B e223d623f976fa3dd4d62ea7395574d96a5c886d038d3396ac42330814c8ae09e771020994b94f5edc21758d4d4f96b77d7ca9187263f5820233472d9b3a0aaa SHA512 3111a3eb58676fe8005d44148f1771587b7ee448597d45edeac1f155fb63e4ca21bdb8890d0f1a121bd75e1018f206de0686ca8fa04384a3c5e80e431a57c362
MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/monocam_settler/files/gcc6.patch b/dev-ros/monocam_settler/files/gcc6.patch
deleted file mode 100644
index 35c84d1fa40f..000000000000
--- a/dev-ros/monocam_settler/files/gcc6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: monocam_settler/CMakeLists.txt
-===================================================================
---- monocam_settler.orig/CMakeLists.txt
-+++ monocam_settler/CMakeLists.txt
-@@ -16,7 +16,7 @@ catkin_package(DEPENDS actionlib actionl
- )
-
-
--include_directories(SYSTEM ${catkin_INCLUDE_DIRS})
-+include_directories(${catkin_INCLUDE_DIRS})
- include_directories(include)
-
- # deal with the include
-@@ -33,7 +33,7 @@ install(TARGETS ${PROJECT_NAME}
- )
-
- # deal with the executable
--include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-+include_directories(${Boost_INCLUDE_DIRS})
- add_executable(monocam_settler_action src/monocam_settler_action.cpp)
- target_link_libraries(monocam_settler_action ${Boost_LIBRARIES}
- ${catkin_LIBRARIES}
diff --git a/dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild b/dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild
deleted file mode 100644
index 66f2b9941697..000000000000
--- a/dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Listens on a ImageFeatures topic, and waits for the data to settle"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/actionlib[${PYTHON_USEDEP}]
- dev-ros/rosconsole
- dev-ros/roscpp_serialization
- dev-ros/settlerlib
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild b/dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild
index d95482f22246..224b75c9e2b0 100644
--- a/dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild
+++ b/dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
@@ -25,4 +24,3 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/monocam_settler/monocam_settler-9999.ebuild b/dev-ros/monocam_settler/monocam_settler-9999.ebuild
index 66f2b9941697..224b75c9e2b0 100644
--- a/dev-ros/monocam_settler/monocam_settler-9999.ebuild
+++ b/dev-ros/monocam_settler/monocam_settler-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
diff --git a/dev-ros/nav_msgs/Manifest b/dev-ros/nav_msgs/Manifest
index 728e5c3640b8..5aef4765ba5c 100644
--- a/dev-ros/nav_msgs/Manifest
+++ b/dev-ros/nav_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-EBUILD nav_msgs-1.12.5.ebuild 519 BLAKE2B 3f116dcc59071f766492d57204944d8d072df3a23f8cdfa6046ee81334523d3048b55be18714ad0d95b31cf35f468091b215a965086e1827e6408ebc06bf2c02 SHA512 46d91ee5e6eb9676c681eef4866ccb468fcd158cd39308349da1371b1fb8a8e859d4969b073b0750f7bfd20a70633b08c3c68e0f390c5e27089e11028356ceb4
-EBUILD nav_msgs-1.12.6.ebuild 519 BLAKE2B 3f116dcc59071f766492d57204944d8d072df3a23f8cdfa6046ee81334523d3048b55be18714ad0d95b31cf35f468091b215a965086e1827e6408ebc06bf2c02 SHA512 46d91ee5e6eb9676c681eef4866ccb468fcd158cd39308349da1371b1fb8a8e859d4969b073b0750f7bfd20a70633b08c3c68e0f390c5e27089e11028356ceb4
-EBUILD nav_msgs-1.12.7.ebuild 519 BLAKE2B 3f116dcc59071f766492d57204944d8d072df3a23f8cdfa6046ee81334523d3048b55be18714ad0d95b31cf35f468091b215a965086e1827e6408ebc06bf2c02 SHA512 46d91ee5e6eb9676c681eef4866ccb468fcd158cd39308349da1371b1fb8a8e859d4969b073b0750f7bfd20a70633b08c3c68e0f390c5e27089e11028356ceb4
-EBUILD nav_msgs-9999.ebuild 519 BLAKE2B 3f116dcc59071f766492d57204944d8d072df3a23f8cdfa6046ee81334523d3048b55be18714ad0d95b31cf35f468091b215a965086e1827e6408ebc06bf2c02 SHA512 46d91ee5e6eb9676c681eef4866ccb468fcd158cd39308349da1371b1fb8a8e859d4969b073b0750f7bfd20a70633b08c3c68e0f390c5e27089e11028356ceb4
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
+EBUILD nav_msgs-1.13.0.ebuild 479 BLAKE2B bee4790d3894f25cf7b5e1026d95a31851766e57369239c43dc55cfd2d5009ce96bf77eafc213b9f8a914040283c495b8f658d94fdf7e10d36fd71a634eb0816 SHA512 392c9f97623ce089b99a16eb3c99e1fb9ac3911f67dcb2f7e8aaeddb515718dc9cf3381e2c8d8062efbfa3a537492a9fb82e384d443df61c849dcfcc440518bf
+EBUILD nav_msgs-9999.ebuild 479 BLAKE2B bee4790d3894f25cf7b5e1026d95a31851766e57369239c43dc55cfd2d5009ce96bf77eafc213b9f8a914040283c495b8f658d94fdf7e10d36fd71a634eb0816 SHA512 392c9f97623ce089b99a16eb3c99e1fb9ac3911f67dcb2f7e8aaeddb515718dc9cf3381e2c8d8062efbfa3a537492a9fb82e384d443df61c849dcfcc440518bf
MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/nav_msgs/nav_msgs-1.12.5.ebuild b/dev-ros/nav_msgs/nav_msgs-1.12.5.ebuild
deleted file mode 100644
index 1113971a55b2..000000000000
--- a/dev-ros/nav_msgs/nav_msgs-1.12.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Common messages used to interact with the navigation stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nav_msgs/nav_msgs-1.12.6.ebuild b/dev-ros/nav_msgs/nav_msgs-1.12.6.ebuild
deleted file mode 100644
index 1113971a55b2..000000000000
--- a/dev-ros/nav_msgs/nav_msgs-1.12.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Common messages used to interact with the navigation stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nav_msgs/nav_msgs-1.12.7.ebuild b/dev-ros/nav_msgs/nav_msgs-1.12.7.ebuild
deleted file mode 100644
index 1113971a55b2..000000000000
--- a/dev-ros/nav_msgs/nav_msgs-1.12.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Common messages used to interact with the navigation stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nav_msgs/nav_msgs-1.13.0.ebuild b/dev-ros/nav_msgs/nav_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..11457f2e0fb4
--- /dev/null
+++ b/dev-ros/nav_msgs/nav_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/actionlib_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Common messages used to interact with the navigation stack"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/nav_msgs/nav_msgs-9999.ebuild b/dev-ros/nav_msgs/nav_msgs-9999.ebuild
index 1113971a55b2..11457f2e0fb4 100644
--- a/dev-ros/nav_msgs/nav_msgs-9999.ebuild
+++ b/dev-ros/nav_msgs/nav_msgs-9999.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/common_msgs"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/actionlib_msgs"
diff --git a/dev-ros/nodelet/Manifest b/dev-ros/nodelet/Manifest
index da24bb288ccd..adf95a9b9fbc 100644
--- a/dev-ros/nodelet/Manifest
+++ b/dev-ros/nodelet/Manifest
@@ -1,4 +1,4 @@
-DIST nodelet_core-1.9.16.tar.gz 44194 BLAKE2B e174ae42d7a6e91f20dee25c8740f0c339b660040d11e2231a350b1f0ca4f37ab48e1811f0aa66a8365f3c280e4ba923aa7f0a2e0997400b2b8ea1775d6fa780 SHA512 36408735028e6034f551e331da8379f5d9dd37128f749830cd5654298fc02c3fdc609e82cdb314cefcb06bd6d36eb6b37f6efa468487ee8068a4da6d0b8c1787
-EBUILD nodelet-1.9.16-r1.ebuild 783 BLAKE2B f259a4292f97a1cba4f4f49659535113fece49b65d23f9775ddbfd741db2e83a84f79ed4ec1e943bcf53e460251d2871dc329621abb597600390395daa02144b SHA512 4e442fcdb62f77ec6128e8af482bbbfb1400d565e03759783ce185fa76c2267e359beadac78aec371214a33d595b288e80d0e61fe0df1007c0c27a04ffe71947
-EBUILD nodelet-9999.ebuild 783 BLAKE2B f259a4292f97a1cba4f4f49659535113fece49b65d23f9775ddbfd741db2e83a84f79ed4ec1e943bcf53e460251d2871dc329621abb597600390395daa02144b SHA512 4e442fcdb62f77ec6128e8af482bbbfb1400d565e03759783ce185fa76c2267e359beadac78aec371214a33d595b288e80d0e61fe0df1007c0c27a04ffe71947
+DIST nodelet_core-1.10.0.tar.gz 45386 BLAKE2B 1da08ec8bc134e0eba72d7c0cde7cfd351c91c5bf4bc8d66ad3d30a8dbe39452c511b6a753ea91a139ce06b617d71f06cfb2f67c7ee2482eb5d2aba79680799c SHA512 4a298cc214660050b7a4d4f3a1e8980cbde2d05bb19369856031a128d3ca7518cbbd4615fe8c0c5944b09dca96aeaa8f41a630b2f34f9e2af423349e816c54e9
+EBUILD nodelet-1.10.0.ebuild 726 BLAKE2B 5d33a12cc0b4ef4a5f1999b3f3ff395ec19b938cc5c5d4b6d59d6a0bb6bfe2db030238e84491158efcd9af666e0b772ba83871f0a51844a44da71ec46813fbc8 SHA512 4e61df9ebbfdbf388d58ad3d3eb41ac13338bc9b52ebd90a70a3184688553248dbc3fb83855837e73d0aed15efb30e5bd51b9f48a0922b36302ced93c56d68c0
+EBUILD nodelet-9999.ebuild 726 BLAKE2B 5d33a12cc0b4ef4a5f1999b3f3ff395ec19b938cc5c5d4b6d59d6a0bb6bfe2db030238e84491158efcd9af666e0b772ba83871f0a51844a44da71ec46813fbc8 SHA512 4e61df9ebbfdbf388d58ad3d3eb41ac13338bc9b52ebd90a70a3184688553248dbc3fb83855837e73d0aed15efb30e5bd51b9f48a0922b36302ced93c56d68c0
MISC metadata.xml 330 BLAKE2B 7f8d8593aa2f28cd25f2c1a7d21fce8f09b3f97ff1fe72bbe532c3f1f3da5ef3c4611c7318ee3638a0e7591a01881ee517b1a484fe5182904d7f3849ebe697a0 SHA512 d1fd92493c64f5d10c309bdf2e9bcfb9faac89cecd7937ef9876a469f4440c5bfa8fec93b316e47a68e68cd44d465be52a7c2a345e2075679dc7045572e9c266
diff --git a/dev-ros/nodelet/nodelet-1.10.0.ebuild b/dev-ros/nodelet/nodelet-1.10.0.ebuild
new file mode 100644
index 000000000000..8b18e8b5a088
--- /dev/null
+++ b/dev-ros/nodelet/nodelet-1.10.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/nodelet_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Runs multiple algorithms in the same process with zero copy transport"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/bondcpp
+ dev-ros/cmake_modules
+ dev-ros/pluginlib
+ dev-libs/tinyxml2:=
+ dev-ros/rosconsole
+ dev-libs/console_bridge:=
+ dev-ros/roscpp
+ dev-libs/boost:=
+ sys-apps/util-linux
+ dev-ros/class_loader:=
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-python/rospkg[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet/nodelet-1.9.16-r1.ebuild b/dev-ros/nodelet/nodelet-1.9.16-r1.ebuild
deleted file mode 100644
index be2fa68eb177..000000000000
--- a/dev-ros/nodelet/nodelet-1.9.16-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a way to run multiple algorithms in the same process with zero copy transport"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bondcpp
- dev-ros/cmake_modules
- dev-ros/pluginlib
- dev-libs/tinyxml2:=
- dev-ros/rosconsole
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-libs/boost:=
- sys-apps/util-linux
- dev-ros/class_loader:=
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet/nodelet-9999.ebuild b/dev-ros/nodelet/nodelet-9999.ebuild
index be2fa68eb177..8b18e8b5a088 100644
--- a/dev-ros/nodelet/nodelet-9999.ebuild
+++ b/dev-ros/nodelet/nodelet-9999.ebuild
@@ -1,17 +1,16 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/nodelet_core"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
inherit ros-catkin
-DESCRIPTION="Provides a way to run multiple algorithms in the same process with zero copy transport"
+DESCRIPTION="Runs multiple algorithms in the same process with zero copy transport"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/nodelet_topic_tools/Manifest b/dev-ros/nodelet_topic_tools/Manifest
index 8c33748815fb..775602e40019 100644
--- a/dev-ros/nodelet_topic_tools/Manifest
+++ b/dev-ros/nodelet_topic_tools/Manifest
@@ -1,4 +1,4 @@
-DIST nodelet_core-1.9.16.tar.gz 44194 BLAKE2B e174ae42d7a6e91f20dee25c8740f0c339b660040d11e2231a350b1f0ca4f37ab48e1811f0aa66a8365f3c280e4ba923aa7f0a2e0997400b2b8ea1775d6fa780 SHA512 36408735028e6034f551e331da8379f5d9dd37128f749830cd5654298fc02c3fdc609e82cdb314cefcb06bd6d36eb6b37f6efa468487ee8068a4da6d0b8c1787
-EBUILD nodelet_topic_tools-1.9.16.ebuild 539 BLAKE2B baee5ba417a62e438eb88149e83adeefd134752fff2588a7c736461d0f4fcd07452e0f88f72c8389c62933f54185a000798a7be0eea58896a637e5335ae89c5e SHA512 d11016dc1ec26bbf7a96cacfd2073fe4791a1e9c6d7580363b72759be9ed05f57e65db8b1058685f05bef2b1f282183e09043da91d3b025d29630c55e816fa01
-EBUILD nodelet_topic_tools-9999.ebuild 539 BLAKE2B a22dcd706e26edd3ae6b0dc1884c9a955bdf76c7e501e13024ca1d0e524a07490ba42dae8a5b5ff94c84fa82ac45e6115b659db144c41c4559dede12b4c888d5 SHA512 185df28ec9286caa2e7f95abcb6f729712dd69f305b637ed7753086735ba73e069d2bbd962123154d6c359e17fe48de7dd9ac1ee7b3ba51b043637d4e68b85e9
+DIST nodelet_core-1.10.0.tar.gz 45386 BLAKE2B 1da08ec8bc134e0eba72d7c0cde7cfd351c91c5bf4bc8d66ad3d30a8dbe39452c511b6a753ea91a139ce06b617d71f06cfb2f67c7ee2482eb5d2aba79680799c SHA512 4a298cc214660050b7a4d4f3a1e8980cbde2d05bb19369856031a128d3ca7518cbbd4615fe8c0c5944b09dca96aeaa8f41a630b2f34f9e2af423349e816c54e9
+EBUILD nodelet_topic_tools-1.10.0.ebuild 508 BLAKE2B 97a2cd3a9246a22275a70b51fc0e19ac0a2988a9c20102a6c9095dcacdd321ad39e695e5154519d5c4e594794653ad1b304212e5593eaa4f10eb7f61406c6ba4 SHA512 33881f858306db630f5ba94d2a01a8d95e8553e050b23116a64f95ba67663f0c90dabc4e23ad6040fa1207e0ca0438fac63d08b757f7d54ce04c2e3369aeda84
+EBUILD nodelet_topic_tools-9999.ebuild 508 BLAKE2B 97a2cd3a9246a22275a70b51fc0e19ac0a2988a9c20102a6c9095dcacdd321ad39e695e5154519d5c4e594794653ad1b304212e5593eaa4f10eb7f61406c6ba4 SHA512 33881f858306db630f5ba94d2a01a8d95e8553e050b23116a64f95ba67663f0c90dabc4e23ad6040fa1207e0ca0438fac63d08b757f7d54ce04c2e3369aeda84
MISC metadata.xml 330 BLAKE2B 7f8d8593aa2f28cd25f2c1a7d21fce8f09b3f97ff1fe72bbe532c3f1f3da5ef3c4611c7318ee3638a0e7591a01881ee517b1a484fe5182904d7f3849ebe697a0 SHA512 d1fd92493c64f5d10c309bdf2e9bcfb9faac89cecd7937ef9876a469f4440c5bfa8fec93b316e47a68e68cd44d465be52a7c2a345e2075679dc7045572e9c266
diff --git a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.0.ebuild b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.0.ebuild
new file mode 100644
index 000000000000..721cb03ad925
--- /dev/null
+++ b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/nodelet_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common nodelet tools such as a mux, demux and throttle"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+ dev-ros/message_filters
+ dev-ros/nodelet
+ dev-ros/pluginlib
+ dev-ros/roscpp
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.9.16.ebuild b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.9.16.ebuild
deleted file mode 100644
index 4a1844edbbaa..000000000000
--- a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.9.16.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Common nodelet tools such as a mux, demux and throttle"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/boost:=[threads]
- dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
- dev-ros/message_filters
- dev-ros/nodelet
- dev-ros/pluginlib
- dev-ros/roscpp
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-9999.ebuild b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-9999.ebuild
index 493a9fc07580..721cb03ad925 100644
--- a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-9999.ebuild
+++ b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/nodelet_core"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/nodelet_tutorial_math/Manifest b/dev-ros/nodelet_tutorial_math/Manifest
index ec86d63f6f83..8c77e387a398 100644
--- a/dev-ros/nodelet_tutorial_math/Manifest
+++ b/dev-ros/nodelet_tutorial_math/Manifest
@@ -1,6 +1,4 @@
-DIST common_tutorials-0.1.10.tar.gz 12511 BLAKE2B deeb06317c0f56f2496277f488592ba056b82440cb320fc9ea6bd3d2d6b8828301ce03c2f5db9ed1871b4f6a1caa8c874a510c912ab89ef1d05b01f364ee09be SHA512 92a1eb5865ec3b4acc9e04a507f050d9568e583ce6d0a29f3c6ab37f4c2feb5149f1ddd6269ce1a310251f7b4cbfe8a05c7e4c6bf4c3ca21c15d84f1c6f0422b
-DIST common_tutorials-0.1.11.tar.gz 12527 BLAKE2B 679cee86aad711677d1ed74320832c7ceb6d66adb34b835a80ad536be7bff517a78ca43e04372de23b491f8156ea3a4c268b4661d74fb1c04130e39033e1b961 SHA512 a42ab4b95eeaf9620ae0987f4e1cc530213b39455dea3ff8d944ac24ee7ed8e321ac8ed4f73b8e4d8d882248a850dface0169a5d521b02b226e6d0cb6016a33a
-EBUILD nodelet_tutorial_math-0.1.10-r1.ebuild 448 BLAKE2B d6c16e8f2a00d7ea2236a37ccd43aed770dc14bdcfb64f5e3cad61dd6367949d25d7fce02e0a44e4dcf5640d1281549258c892ff44077ac552e51c6a811ed85f SHA512 f14ea87995d783070c17e453f2deeaeffb5ee6fd73cc6d0bffedef17c5e29c0bc5a2fe0f8acd249d56b53238119cfb5de2af21e3d525852141589e7643ac557c
-EBUILD nodelet_tutorial_math-0.1.11.ebuild 448 BLAKE2B 4316d0a15fc1c88f0b262ac23763cb46a77f6b6b9e7541d234ca6145ebbec470b4af221b38e39c1ebccf3caa9392b8d2e28ce0982740cd49e0dabc92a65fea74 SHA512 86d106c5368e526982747e5418b95fc8eb43eb476fd9e2046216f7ee375600865043c966947bcc955f61dd0bedb6eea57f21df471c18609a884abaf8e0503536
-EBUILD nodelet_tutorial_math-9999.ebuild 448 BLAKE2B d6c16e8f2a00d7ea2236a37ccd43aed770dc14bdcfb64f5e3cad61dd6367949d25d7fce02e0a44e4dcf5640d1281549258c892ff44077ac552e51c6a811ed85f SHA512 f14ea87995d783070c17e453f2deeaeffb5ee6fd73cc6d0bffedef17c5e29c0bc5a2fe0f8acd249d56b53238119cfb5de2af21e3d525852141589e7643ac557c
+DIST common_tutorials-0.1.12.tar.gz 12609 BLAKE2B c570236517420685a4733d84694a03486798038f4b7a0e721179d602a6870b51afb558dedd64ed2ccf518bb0e37cccefcae701053eb4c5fe32ef3e2d5dc5d69b SHA512 37244290b0c84aff47172484e2f3c1eecfe3482856030a08e55f2d1b0cad903262be453e81780f58e250c4e1f24c06f6256da5ff1342617d7d5f501f38fc7527
+EBUILD nodelet_tutorial_math-0.1.12.ebuild 445 BLAKE2B b8f1ba53801eb6a4a17acdfe54ca9fd6f6e3af45e7e4be163a920fa57a1e922229cb34da5a368661c2ebaf9408b851f33cf81b062957775964aa53f481ff59d5 SHA512 df66b37489bf9a322c2b1f2d3b5518c1d70b882d637af13a1d24b211fa31aafbe596087e66611d2ce868f7d8a121523df5797c9f8adcbeaaf63ec89754313f42
+EBUILD nodelet_tutorial_math-9999.ebuild 445 BLAKE2B b8f1ba53801eb6a4a17acdfe54ca9fd6f6e3af45e7e4be163a920fa57a1e922229cb34da5a368661c2ebaf9408b851f33cf81b062957775964aa53f481ff59d5 SHA512 df66b37489bf9a322c2b1f2d3b5518c1d70b882d637af13a1d24b211fa31aafbe596087e66611d2ce868f7d8a121523df5797c9f8adcbeaaf63ec89754313f42
MISC metadata.xml 334 BLAKE2B 9448c76327ed1df85e94f230f66b62356f9f3f6e0ae2853cba879c3357bf19ba534098914207e4bca6e21b3a1e33a5a911084a5f83b9d9b1bdba8282bf70b6e5 SHA512 dcec72972fcaf9c06c0fcc8ed3825875667e3391de433ace73961159cede1a33c40f7dfca78ca22e018e730024af73562786f90fcc1f2ccf39ab11106f37d038
diff --git a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.10-r1.ebuild b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.10-r1.ebuild
deleted file mode 100644
index de79698d1cf3..000000000000
--- a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.10-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelet tutorial"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/nodelet
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.11.ebuild b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.11.ebuild
deleted file mode 100644
index 53cd8355481a..000000000000
--- a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.11.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelet tutorial"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/nodelet
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.12.ebuild b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.12.ebuild
new file mode 100644
index 000000000000..b0642c31d40f
--- /dev/null
+++ b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.12.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/common_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Nodelet tutorial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/nodelet
+ dev-libs/console_bridge:=
+ dev-ros/roscpp
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-9999.ebuild b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-9999.ebuild
index de79698d1cf3..b0642c31d40f 100644
--- a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-9999.ebuild
+++ b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/common_tutorials"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
diff --git a/dev-ros/pluginlib_tutorials/Manifest b/dev-ros/pluginlib_tutorials/Manifest
index 680ba28c61b5..37080a9f2cd8 100644
--- a/dev-ros/pluginlib_tutorials/Manifest
+++ b/dev-ros/pluginlib_tutorials/Manifest
@@ -1,6 +1,4 @@
-DIST common_tutorials-0.1.10.tar.gz 12511 BLAKE2B deeb06317c0f56f2496277f488592ba056b82440cb320fc9ea6bd3d2d6b8828301ce03c2f5db9ed1871b4f6a1caa8c874a510c912ab89ef1d05b01f364ee09be SHA512 92a1eb5865ec3b4acc9e04a507f050d9568e583ce6d0a29f3c6ab37f4c2feb5149f1ddd6269ce1a310251f7b4cbfe8a05c7e4c6bf4c3ca21c15d84f1c6f0422b
-DIST common_tutorials-0.1.11.tar.gz 12527 BLAKE2B 679cee86aad711677d1ed74320832c7ceb6d66adb34b835a80ad536be7bff517a78ca43e04372de23b491f8156ea3a4c268b4661d74fb1c04130e39033e1b961 SHA512 a42ab4b95eeaf9620ae0987f4e1cc530213b39455dea3ff8d944ac24ee7ed8e321ac8ed4f73b8e4d8d882248a850dface0169a5d521b02b226e6d0cb6016a33a
-EBUILD pluginlib_tutorials-0.1.10-r1.ebuild 427 BLAKE2B 9034636d57edc8b2cf501cd86a074e5f1975c7b1298926e7758384bcf471a4b61f0185204131e3aedb003e4db87ee3cfd7eeb8b36b044f24cdfd2844569ac1a5 SHA512 5105134c0ac368dde546a0de13202501f73c9d7f538c04f834f89ea858da5dac2b0a04f4df2f292cf198106256d57bea0e9d8ced7324cbe559a6356b34098cb5
-EBUILD pluginlib_tutorials-0.1.11.ebuild 427 BLAKE2B 180959bb51bdd65436cc3e727788d16d58e096aebffe0c16f852385f30f996adf7a72800f370c0e43090bc3f9831c773afc8ded727aab4320fb7c814cfa75f3d SHA512 ef29b01d5524e9c69680a1fad1eb49a514d05fe98d39219439ab3cc36318d1301404235992c2312a635505cd677c513308a7996539fdde2f98b2d1a89812bc70
-EBUILD pluginlib_tutorials-9999.ebuild 427 BLAKE2B 9034636d57edc8b2cf501cd86a074e5f1975c7b1298926e7758384bcf471a4b61f0185204131e3aedb003e4db87ee3cfd7eeb8b36b044f24cdfd2844569ac1a5 SHA512 5105134c0ac368dde546a0de13202501f73c9d7f538c04f834f89ea858da5dac2b0a04f4df2f292cf198106256d57bea0e9d8ced7324cbe559a6356b34098cb5
+DIST common_tutorials-0.1.12.tar.gz 12609 BLAKE2B c570236517420685a4733d84694a03486798038f4b7a0e721179d602a6870b51afb558dedd64ed2ccf518bb0e37cccefcae701053eb4c5fe32ef3e2d5dc5d69b SHA512 37244290b0c84aff47172484e2f3c1eecfe3482856030a08e55f2d1b0cad903262be453e81780f58e250c4e1f24c06f6256da5ff1342617d7d5f501f38fc7527
+EBUILD pluginlib_tutorials-0.1.12.ebuild 424 BLAKE2B 1346a531b6feeddd413fc55cdc2e1c9a3798e3d345e868af81f3f61a08b0e3d9a36603cb0fe17d974c9ae601cfddbe7ebe55963cbfd739dc3e205b89cec239d9 SHA512 41570e6500d74d78c4a0e45becf992627932d9a27ea13aeb326329992e401dbe246366c2f1473394c0b7de192850617c73d2dc1d3f8c989849efbf6238dc9c3a
+EBUILD pluginlib_tutorials-9999.ebuild 424 BLAKE2B 1346a531b6feeddd413fc55cdc2e1c9a3798e3d345e868af81f3f61a08b0e3d9a36603cb0fe17d974c9ae601cfddbe7ebe55963cbfd739dc3e205b89cec239d9 SHA512 41570e6500d74d78c4a0e45becf992627932d9a27ea13aeb326329992e401dbe246366c2f1473394c0b7de192850617c73d2dc1d3f8c989849efbf6238dc9c3a
MISC metadata.xml 334 BLAKE2B 9448c76327ed1df85e94f230f66b62356f9f3f6e0ae2853cba879c3357bf19ba534098914207e4bca6e21b3a1e33a5a911084a5f83b9d9b1bdba8282bf70b6e5 SHA512 dcec72972fcaf9c06c0fcc8ed3825875667e3391de433ace73961159cede1a33c40f7dfca78ca22e018e730024af73562786f90fcc1f2ccf39ab11106f37d038
diff --git a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.10-r1.ebuild b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.10-r1.ebuild
deleted file mode 100644
index 96884ccfd465..000000000000
--- a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.10-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Pluginlib tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/pluginlib
- dev-libs/tinyxml2:=
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.11.ebuild b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.11.ebuild
deleted file mode 100644
index 6814fa431ca0..000000000000
--- a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.11.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Pluginlib tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/pluginlib
- dev-libs/tinyxml2:=
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.12.ebuild b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.12.ebuild
new file mode 100644
index 000000000000..1bb6261afa2a
--- /dev/null
+++ b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.12.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/common_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Pluginlib tutorials"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/pluginlib
+ dev-libs/tinyxml2:=
+ dev-libs/console_bridge:=
+ dev-ros/roscpp
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-9999.ebuild b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-9999.ebuild
index 96884ccfd465..1bb6261afa2a 100644
--- a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-9999.ebuild
+++ b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/common_tutorials"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
diff --git a/dev-ros/rosbag/Manifest b/dev-ros/rosbag/Manifest
index 9bb649c36b40..0f938458f3c3 100644
--- a/dev-ros/rosbag/Manifest
+++ b/dev-ros/rosbag/Manifest
@@ -1,8 +1,5 @@
AUX pycrypto.patch 402 BLAKE2B 2f784f93115b205285bb9eb9c910185f84871da7ecc5865304d220df7e1e9bea3799743a1f7a2a274423ec3fa4e367773814bd5fbb5cb074acb7252845ba6e94 SHA512 2343aca88929010f76389f31187b913f92f8d510a18a0d81b20c2c9accc2da68d15fd959404f11d363bdbe98f644ff2e76a70fdca4a718b490fa7f812a1b417e
-AUX yaml.patch 2142 BLAKE2B 3b42703dc19179852e53bb98e6b450014bfa21d3f253e912ff6ce970b0904ae700b724e761821fa9b5a880789de8c80a2820e9a64bb2e56fb1783b034f4291ad SHA512 a5c41b8b374b33c577375495e6599daa50685664794ffc0c9dd83118b4ea8d74c68e3831ea426a1a3bce585e35f9039a86fab4266840b4eb3302bb4454ac889a
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosbag-1.14.3-r3.ebuild 877 BLAKE2B 3b9c2e9d89270a5011c8480b791a72ae50b10292766c9eb5a8826e16ebbea61869a72a7b17709bdb1b2c7f422d9e02afee032df3f21b2921630fdb455acd3552 SHA512 09029c964574932beb792fc5008334e4f31e7428c9a098c87484c59fe7995b85d57febea5e3d76c8129ef011764543945b60d31ee358788e6b5ce540ccbc6830
-EBUILD rosbag-1.15.4.ebuild 881 BLAKE2B 2f6251489319075dac9ab839ca967cc88ab2f698c951e4381531c297cd01edf17570a2a70145f3d55b821bcef992d90c1dc1a6c11457ff2cb15ca946e6d144a6 SHA512 3c3cfe681870436df68d6c20b320ede685766c232c9545eb1319d0abde83ad7090ef61df84ad8a228203be83e750569afe44edf7e3142978377b224c83588622
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD rosbag-1.15.7.ebuild 881 BLAKE2B 2f6251489319075dac9ab839ca967cc88ab2f698c951e4381531c297cd01edf17570a2a70145f3d55b821bcef992d90c1dc1a6c11457ff2cb15ca946e6d144a6 SHA512 3c3cfe681870436df68d6c20b320ede685766c232c9545eb1319d0abde83ad7090ef61df84ad8a228203be83e750569afe44edf7e3142978377b224c83588622
EBUILD rosbag-9999.ebuild 881 BLAKE2B 2f6251489319075dac9ab839ca967cc88ab2f698c951e4381531c297cd01edf17570a2a70145f3d55b821bcef992d90c1dc1a6c11457ff2cb15ca946e6d144a6 SHA512 3c3cfe681870436df68d6c20b320ede685766c232c9545eb1319d0abde83ad7090ef61df84ad8a228203be83e750569afe44edf7e3142978377b224c83588622
MISC metadata.xml 418 BLAKE2B 2d84b96bfb428654a9b926100a8bd083afb2addc6db8b2e6fb003fab4bb8c1615df40ee13c863a3ddfe98a1a1f9b72af8310a80a9f610a01fe14366afde2e38d SHA512 d7579d9a25bf9f83513e3d8058ec845ee9b59e5d999128532b63d992cee8ef94922aee88140f044829442077c6f9ae80d6b0b0f554cf677690fdc88a17c9f260
diff --git a/dev-ros/rosbag/files/yaml.patch b/dev-ros/rosbag/files/yaml.patch
deleted file mode 100644
index aea89788c1ea..000000000000
--- a/dev-ros/rosbag/files/yaml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py | 2 +-
- .../test/test_roslib_message.py | 2 +-
- .../client_verification/test_slave_api.py | 2 +-
- test/test_rosparam/test/check_rosparam.py | 8 ++---
- .../check_rosparam_command_line_online.py | 2 +-
- .../check_rosservice_command_line_online.py | 4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py | 2 +-
- tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
- tools/roslaunch/src/roslaunch/loader.py | 4 +--
- .../test/unit/test_roslaunch_dump_params.py | 4 +--
- tools/rosparam/src/rosparam/__init__.py | 7 ++++-
- tools/rosservice/src/rosservice/__init__.py | 4 +--
- tools/rostopic/src/rostopic/__init__.py | 6 ++--
- tools/topic_tools/scripts/relay_field | 2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/tools/rosbag/src/rosbag/bag.py b/tools/rosbag/src/rosbag/bag.py
-index 0578aed91..9bdcb693d 100644
---- a/tools/rosbag/src/rosbag/bag.py
-+++ b/tools/rosbag/src/rosbag/bag.py
-@@ -1250,7 +1250,7 @@ def __init__(self, d):
- else:
- setattr(self, a, DictObject(b) if isinstance(b, dict) else b)
-
-- obj = DictObject(yaml.load(s))
-+ obj = DictObject(yaml.safe_load(s))
- try:
- val = eval('obj.' + key)
- except Exception as ex:
diff --git a/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild b/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild
deleted file mode 100644
index 7249f56e314a..000000000000
--- a/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE="lz4"
-
-RDEPEND="
- >=dev-ros/rosbag_storage-1.14
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/topic_tools
- dev-ros/xmlrpcpp
- dev-libs/boost:=
- app-arch/bzip2
- dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/genpy[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-libs/console_bridge:=
- dev-python/pycryptodome[${PYTHON_USEDEP}]
- dev-python/python-gnupg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
- lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/rosbag/rosbag-1.15.4.ebuild b/dev-ros/rosbag/rosbag-1.15.7.ebuild
similarity index 100%
rename from dev-ros/rosbag/rosbag-1.15.4.ebuild
rename to dev-ros/rosbag/rosbag-1.15.7.ebuild
diff --git a/dev-ros/rosbag_storage/Manifest b/dev-ros/rosbag_storage/Manifest
index ebb6c245341e..abbb8a186b8a 100644
--- a/dev-ros/rosbag_storage/Manifest
+++ b/dev-ros/rosbag_storage/Manifest
@@ -1,8 +1,4 @@
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosbag_storage-1.14.2-r1.ebuild 597 BLAKE2B 396fa1a667259dc91de933d9537bf54db019b2e06c64ab5f4dfe5cc550813ccf5a629dec9ff53d3f409ce602d4b6ce2c7201f505eddc74aa5b9b1d40561f70c1 SHA512 35b01188976c4273bcd62675d4d88cd27947e57e53e0de036084a577c564ffb477bbc46f5966b9abcf7464c8a36bb86c4a91cc89cdb334a1e6abb777caf314f4
-EBUILD rosbag_storage-1.14.3-r2.ebuild 654 BLAKE2B e89f69d4007184e383b514b9dd3a9eae2d45d7f856cfe26db32f3e262c34d7bce64eb62cb35c90930e4408191930ce8c1587f91fdaea2fbb50d11aec270fc941 SHA512 3a9c4f1e3e134d1c7ed44fb998d5b1cbd7cc6e2953a4e5eef3de4daab9b32a75a4693e149d9f104792d3727bd7228a5dee0012c123cc428737658221cde8f6fb
-EBUILD rosbag_storage-1.15.4.ebuild 654 BLAKE2B 1be6603ceba6193bbeaa2276ec10ab58a85016b7c3b32194b7bd1081d9a85d210532138175fdda886b562de6ea1d54f6e323d9d829f3e8dda3022e669cd788af SHA512 22235a935488e0c824bfd3874d8a154cdc3ae62f0e21e883968e540697e58ff9535139de69c343d7a622447f174883e606288c9c90672e6c082c698fb22549d7
-EBUILD rosbag_storage-9999.ebuild 654 BLAKE2B e89f69d4007184e383b514b9dd3a9eae2d45d7f856cfe26db32f3e262c34d7bce64eb62cb35c90930e4408191930ce8c1587f91fdaea2fbb50d11aec270fc941 SHA512 3a9c4f1e3e134d1c7ed44fb998d5b1cbd7cc6e2953a4e5eef3de4daab9b32a75a4693e149d9f104792d3727bd7228a5dee0012c123cc428737658221cde8f6fb
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD rosbag_storage-1.15.7.ebuild 654 BLAKE2B a82c0a23646c85b08d76b91d0c9455e63643828b42d96c1049552640afa986a6b047096dfa503fafaac9486b9e8b77ce08c48c2f6cf6993bf8a560bd84e1ea0c SHA512 20f8d2695ddb1078b9edd23ccdd5a9095935a414bccc4e5135259243b9d96617b7a3832cae95eab94299b798fec3aa13a2ff1b7abfe0b23278c0724d5de3b6ac
+EBUILD rosbag_storage-9999.ebuild 654 BLAKE2B a82c0a23646c85b08d76b91d0c9455e63643828b42d96c1049552640afa986a6b047096dfa503fafaac9486b9e8b77ce08c48c2f6cf6993bf8a560bd84e1ea0c SHA512 20f8d2695ddb1078b9edd23ccdd5a9095935a414bccc4e5135259243b9d96617b7a3832cae95eab94299b798fec3aa13a2ff1b7abfe0b23278c0724d5de3b6ac
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.14.2-r1.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.14.2-r1.ebuild
deleted file mode 100644
index 048f341e9d2d..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.14.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back ROS message"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/console_bridge
- app-crypt/gpgme
- dev-ros/pluginlib
- dev-ros/cpp_common
- dev-ros/roscpp_serialization
- dev-ros/roscpp_traits
- dev-ros/rostime
- dev-ros/roslz4
- dev-libs/boost:=
- app-arch/bzip2
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.14.3-r2.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.14.3-r2.ebuild
deleted file mode 100644
index d2265060d274..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.14.3-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back ROS message"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/console_bridge
- app-crypt/gpgme
- dev-ros/pluginlib
- dev-ros/cpp_common
- dev-ros/roscpp_serialization
- dev-ros/roscpp_traits
- dev-ros/rostime
- dev-ros/roslz4
- dev-libs/boost:=
- app-arch/bzip2
- dev-libs/console_bridge:=
- dev-libs/tinyxml2:=
-
- dev-libs/openssl:0=
- app-crypt/gpgme
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.4.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.4.ebuild
deleted file mode 100644
index 4095940515c2..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.15.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back ROS message"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/console_bridge
- app-crypt/gpgme
- dev-ros/pluginlib
- dev-ros/cpp_common
- dev-ros/roscpp_serialization
- dev-ros/roscpp_traits
- dev-ros/rostime
- dev-ros/roslz4
- dev-libs/boost:=
- app-arch/bzip2
- dev-libs/console_bridge:=
- dev-libs/tinyxml2:=
-
- dev-libs/openssl:0=
- app-crypt/gpgme
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.7.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.7.ebuild
new file mode 100644
index 000000000000..616e74d99b96
--- /dev/null
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.15.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back ROS message"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/console_bridge
+ app-crypt/gpgme
+ dev-ros/pluginlib
+ dev-ros/cpp_common
+ dev-ros/roscpp_serialization
+ dev-ros/roscpp_traits
+ dev-ros/rostime
+ dev-ros/roslz4
+ dev-libs/boost:=
+ app-arch/bzip2
+ dev-libs/console_bridge:=
+ dev-libs/tinyxml2:=
+
+ dev-libs/openssl:0=
+ app-crypt/gpgme
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild b/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
index d2265060d274..616e74d99b96 100644
--- a/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
+++ b/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/roscpp/Manifest b/dev-ros/roscpp/Manifest
index 0da9943f990d..ede7b565cc2a 100644
--- a/dev-ros/roscpp/Manifest
+++ b/dev-ros/roscpp/Manifest
@@ -1,8 +1,5 @@
-AUX boost.patch 1237 BLAKE2B bdea2bd55d1df3db2bdf3df15fd648bd488403068fc4667a2f1217cedaa066d5bb24cde84f1b9bc2ae43c33baec0dd601e0de1c036d0a522d9bf215f00cdf8eb SHA512 383a3c7ec2f4d92f578a18f530e2cf856c269bf761adb4c2a015fdffa5ee8adfbb2d62086c0c2a126653ea63a97763a8631eb93a82d1e9da5898c54f7187eadd
AUX boost173.patch 3035 BLAKE2B 3ce759d081ebaaab9e10b838515ffe41d3e5c3925e995379fe768030e1a308f3531aea70c97aa0b761fd9531ec18fb054a7b1f4ff0ad3f522a4e28a7165f7571 SHA512 6b263429c7172189e4d341a1e0471d70de419d3c694bcd09549d057fd8568facd30b46a2adbb66f0cb5216333225ed5db5752be4ebc17980e2080312031c7409
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD roscpp-1.14.3-r1.ebuild 644 BLAKE2B ccb0c12829043287d21b36636ec34b2aecd9f4b3aaf6f66619bd76fd7886b2aa789bd47eabe348c4b8c374cefd07370485816e6160ce7740b1ad22dfcdf23905 SHA512 a10ac9244f4b769ec523147a325088294340787ac09a56f32826796b9df9d83b3bdc98101a422794494d5fcaedeef9c1b7bc35ad593acc8a086e7b8e22a07dd7
-EBUILD roscpp-1.15.4.ebuild 647 BLAKE2B 10abcfc901b53a6de6abce9a5ae0e8ac5f17939ace4126c13a2ecd326854c635174f1b68740ed5f177600309ee63aefac3bb7e4c338fd5c7d50699d2cd4fc9a8 SHA512 f098ea166d39d993387205ee1c7d51bfac64bf536f2399ca2cbae70dc992428bd858c2d864b20531f2c956cb3cc26cf991def027bf1ef1145993f8db1888e9f3
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD roscpp-1.15.7.ebuild 647 BLAKE2B 10abcfc901b53a6de6abce9a5ae0e8ac5f17939ace4126c13a2ecd326854c635174f1b68740ed5f177600309ee63aefac3bb7e4c338fd5c7d50699d2cd4fc9a8 SHA512 f098ea166d39d993387205ee1c7d51bfac64bf536f2399ca2cbae70dc992428bd858c2d864b20531f2c956cb3cc26cf991def027bf1ef1145993f8db1888e9f3
EBUILD roscpp-9999.ebuild 647 BLAKE2B 10abcfc901b53a6de6abce9a5ae0e8ac5f17939ace4126c13a2ecd326854c635174f1b68740ed5f177600309ee63aefac3bb7e4c338fd5c7d50699d2cd4fc9a8 SHA512 f098ea166d39d993387205ee1c7d51bfac64bf536f2399ca2cbae70dc992428bd858c2d864b20531f2c956cb3cc26cf991def027bf1ef1145993f8db1888e9f3
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roscpp/files/boost.patch b/dev-ros/roscpp/files/boost.patch
deleted file mode 100644
index 1d509a8ab6c7..000000000000
--- a/dev-ros/roscpp/files/boost.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 41f18edc9f2f0b1ef304ea25f148bd56a6bf3d70
-Author: Maarten de Vries
-Date: Thu Jan 31 00:58:29 2019 +0100
-
- Remove signals from find_package(Boost COMPONENTS ...) (#1580)
-
- The packages use signals2, not signals. Only boost libraries with
- compiled code should be passed to find_package(Boost COMPONENTS ...),
- and the signals2 library has always been header only.
-
- Boost 1.69 has removed the deprecated signals library, so the otherwise
- useless but harmless `signals` component now breaks the build.
-
-diff --git a/clients/roscpp/CMakeLists.txt b/clients/roscpp/CMakeLists.txt
-index a5d354ea6..8f462df2c 100644
---- a/clients/roscpp/CMakeLists.txt
-+++ b/clients/roscpp/CMakeLists.txt
-@@ -22,7 +22,7 @@ list(GET roscpp_VERSION_LIST 2 roscpp_VERSION_PATCH)
-
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/ros/common.h.in ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros/common.h)
-
--find_package(Boost REQUIRED COMPONENTS chrono filesystem signals system)
-+find_package(Boost REQUIRED COMPONENTS chrono filesystem system)
-
- include_directories(include ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
-
diff --git a/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild b/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild
deleted file mode 100644
index 9f927d9f390b..000000000000
--- a/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cpp_common
- dev-ros/rosconsole
- dev-ros/roscpp_serialization
- dev-ros/roscpp_traits
- dev-ros/rostime
- dev-ros/xmlrpcpp
- dev-libs/boost:=
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/roscpp/roscpp-1.15.4.ebuild b/dev-ros/roscpp/roscpp-1.15.7.ebuild
similarity index 100%
rename from dev-ros/roscpp/roscpp-1.15.4.ebuild
rename to dev-ros/roscpp/roscpp-1.15.7.ebuild
diff --git a/dev-ros/rosdiagnostic/Manifest b/dev-ros/rosdiagnostic/Manifest
index 928842b69962..5a1072b430f2 100644
--- a/dev-ros/rosdiagnostic/Manifest
+++ b/dev-ros/rosdiagnostic/Manifest
@@ -1,8 +1,4 @@
-DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
-DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
-DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
-EBUILD rosdiagnostic-1.9.0.ebuild 500 BLAKE2B 4e29cfbdea9d462e0eb76576f654894a67e91e19fa252f3272f9b513415b38f8f6c96cb5b5af4a89203650cc1f66917f5e8ca9eee34df22a609d2c6c4fcde7fe SHA512 a6382ca1963af712509f5f8f2cda581b9844010d2bd684e857058959c005377af68c071b2af6140bbe18e88e39f001bcbb57e8ab991fdcc02a943624bc7e2a5d
-EBUILD rosdiagnostic-1.9.2.ebuild 500 BLAKE2B 4e29cfbdea9d462e0eb76576f654894a67e91e19fa252f3272f9b513415b38f8f6c96cb5b5af4a89203650cc1f66917f5e8ca9eee34df22a609d2c6c4fcde7fe SHA512 a6382ca1963af712509f5f8f2cda581b9844010d2bd684e857058959c005377af68c071b2af6140bbe18e88e39f001bcbb57e8ab991fdcc02a943624bc7e2a5d
-EBUILD rosdiagnostic-1.9.3.ebuild 500 BLAKE2B 4e29cfbdea9d462e0eb76576f654894a67e91e19fa252f3272f9b513415b38f8f6c96cb5b5af4a89203650cc1f66917f5e8ca9eee34df22a609d2c6c4fcde7fe SHA512 a6382ca1963af712509f5f8f2cda581b9844010d2bd684e857058959c005377af68c071b2af6140bbe18e88e39f001bcbb57e8ab991fdcc02a943624bc7e2a5d
-EBUILD rosdiagnostic-9999.ebuild 500 BLAKE2B 4e29cfbdea9d462e0eb76576f654894a67e91e19fa252f3272f9b513415b38f8f6c96cb5b5af4a89203650cc1f66917f5e8ca9eee34df22a609d2c6c4fcde7fe SHA512 a6382ca1963af712509f5f8f2cda581b9844010d2bd684e857058959c005377af68c071b2af6140bbe18e88e39f001bcbb57e8ab991fdcc02a943624bc7e2a5d
+DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
+EBUILD rosdiagnostic-1.9.4.ebuild 460 BLAKE2B 4b8dc8229046a1b7077f1932897e62cfe5cebaf93dedfbadf787aa53182bb2c48856aedaef00d581fb219098482bff9c0ff2d0c787f2c78f9bdbc215df46d1d8 SHA512 d31efc62550d90fbf507cb27be2a10376967d5d667a78ffe6b143ef445be7cdad2eac88f11f34ec7357fea34108772bf6cb30a44c8c551373b7f7a676c549467
+EBUILD rosdiagnostic-9999.ebuild 460 BLAKE2B 4b8dc8229046a1b7077f1932897e62cfe5cebaf93dedfbadf787aa53182bb2c48856aedaef00d581fb219098482bff9c0ff2d0c787f2c78f9bdbc215df46d1d8 SHA512 d31efc62550d90fbf507cb27be2a10376967d5d667a78ffe6b143ef445be7cdad2eac88f11f34ec7357fea34108772bf6cb30a44c8c551373b7f7a676c549467
MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.0.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.9.0.ebuild
deleted file mode 100644
index 95a6acb8adc5..000000000000
--- a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command to print aggregated diagnostic contents to the command line"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.2.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.9.2.ebuild
deleted file mode 100644
index 95a6acb8adc5..000000000000
--- a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command to print aggregated diagnostic contents to the command line"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.3.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.9.3.ebuild
deleted file mode 100644
index 95a6acb8adc5..000000000000
--- a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command to print aggregated diagnostic contents to the command line"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.4.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.9.4.ebuild
new file mode 100644
index 000000000000..c6251b17993b
--- /dev/null
+++ b/dev-ros/rosdiagnostic/rosdiagnostic-1.9.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command to print aggregated diagnostic contents to the command line"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-9999.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-9999.ebuild
index 95a6acb8adc5..c6251b17993b 100644
--- a/dev-ros/rosdiagnostic/rosdiagnostic-9999.ebuild
+++ b/dev-ros/rosdiagnostic/rosdiagnostic-9999.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/diagnostics"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
inherit ros-catkin
diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest
index 269425a10d7e..efe4ee45ef38 100644
--- a/dev-ros/rosgraph/Manifest
+++ b/dev-ros/rosgraph/Manifest
@@ -1,9 +1,4 @@
-AUX py3-2.patch 2357 BLAKE2B a3af95fdd93c1e5540626a529696583c366623a34a056122efde2eccf19219c70528cfcf227ffe96c2e5c90c5d26da5127f5ae3fdbd47a0da045dea4e9b34f08 SHA512 3437178097e04ac0b169a0612579a839f1d1d391859df9e215a3a016b301d1a22cd37a1c25684d55e7af0958a46af0e6d8ed759798a350dd7839a1b2b5bc7783
-AUX py3.patch 1616 BLAKE2B 56b70362a387ca67c97041456f185f4fb10959d32c7a54d825c8ee2a2dc71cc6bef3f2b9883083596f28bd26442d1b6d9bf92e563a5d3a8872a608a676949aa4 SHA512 e12466e7f86252516a7a094fdb6b0bbfeef784cae3a6638683b84aa5ee94c6848ecb1a22121719339f65fecdaa0d25a26c27d986c771ad2a82dc42975dad6118
-AUX yaml.patch 2245 BLAKE2B 2048938c0532efee2bca2cd7bdc5f544670245cd3b647613e8ec1a80588fad33287931ead00fc63c27e03e825bfb5c2b8db5bae75446184f85fc0c09abb26f3d SHA512 6346eb9231152dd91627b67f99f1268fc158136092d62e86fa01c7adb831a31e36844c12dbb3c52f190fbd6b4dbd77b026fe5190496d88ba4326abf55f7339ac
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosgraph-1.14.3-r1.ebuild 638 BLAKE2B 466cd36f189b553c024553471e9bc912cb1c7c56c5e99d85c3783e8806b047c5dde65a2212e8e75008e6baa571d974ccc88fee8484fb585f4ffd440f1cfc8554 SHA512 241bcf3ac7f4a244bb186a23d2b66bcdbd0101234acbeb64acef219c81220789f080610e6aeec0767f76f74814f3d640f48daae630e1221c88ab74c725f7470a
-EBUILD rosgraph-1.15.4.ebuild 551 BLAKE2B 16d5178f64797054ee4de083110175ddffa6b0edd714c64fbd149cf8493f97ff8839f4fa83d7724689aad6a4cb6d38238ed07461b07addd286afbe2725502324 SHA512 39901b1d4e9df5316c0a170a928cd4e09bad87a564be69897b9f594c4008ce96a67459d989cd419fc370f0b1b8a1cc890f97e690b46a99da0056e7be3d0454c9
-EBUILD rosgraph-9999.ebuild 551 BLAKE2B 16d5178f64797054ee4de083110175ddffa6b0edd714c64fbd149cf8493f97ff8839f4fa83d7724689aad6a4cb6d38238ed07461b07addd286afbe2725502324 SHA512 39901b1d4e9df5316c0a170a928cd4e09bad87a564be69897b9f594c4008ce96a67459d989cd419fc370f0b1b8a1cc890f97e690b46a99da0056e7be3d0454c9
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD rosgraph-1.15.7.ebuild 511 BLAKE2B 9f63f8a2905c83edacc5b3e59ca698a8f1c5c8387a0e2e20f887d04595a6565f9f68105d4987716cd20ff965b31efa8cd83a87e9fb4c93dfb8997420c9759c50 SHA512 138ca6aeb99dff4f533e306d9e430873d584e8bfc748dc94f6efe6a5b0168d2ab978bc5edd4a6e57ac0851381f183b64e860da2bb7c99731e80f88c7d3d87733
+EBUILD rosgraph-9999.ebuild 511 BLAKE2B 9f63f8a2905c83edacc5b3e59ca698a8f1c5c8387a0e2e20f887d04595a6565f9f68105d4987716cd20ff965b31efa8cd83a87e9fb4c93dfb8997420c9759c50 SHA512 138ca6aeb99dff4f533e306d9e430873d584e8bfc748dc94f6efe6a5b0168d2ab978bc5edd4a6e57ac0851381f183b64e860da2bb7c99731e80f88c7d3d87733
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosgraph/files/py3-2.patch b/dev-ros/rosgraph/files/py3-2.patch
deleted file mode 100644
index b83b349576bd..000000000000
--- a/dev-ros/rosgraph/files/py3-2.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
-From: Dirk Thomas
-Date: Tue, 6 Aug 2019 16:06:51 -0700
-Subject: [PATCH] more Python 3 compatibility (#1783)
-
----
- test/test_rospy/test/unit/test_genmsg_py.py | 6 +--
- tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
- .../test/test_roslogging_user_logger.py | 8 +++-
- tools/roslaunch/test/unit/test_xmlloader.py | 2 +-
- tools/rosmsg/src/rosmsg/__init__.py | 2 +-
- tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
- .../test/test_rosmsgproto_command_line.py | 20 ++++----
- .../test_rostopic_command_line_offline.py | 44 +++++++++---------
- 8 files changed, 67 insertions(+), 63 deletions(-)
-
-diff --git a/tools/rosgraph/src/rosgraph/roslogging.py b/tools/rosgraph/src/rosgraph/roslogging.py
-index bbf1d9f49..51c39becd 100644
---- a/tools/rosgraph/src/rosgraph/roslogging.py
-+++ b/tools/rosgraph/src/rosgraph/roslogging.py
-@@ -49,7 +49,7 @@
- class LoggingException(Exception): pass
-
- class RospyLogger(logging.getLoggerClass()):
-- def findCaller(self, dummy=False): # Dummy second arg to match Python3 function declaration
-+ def findCaller(self, stack_info=False):
- """
- Find the stack frame of the caller so that we can note the source
- file name, line number, and function name with class name if possible.
-diff --git a/tools/rosgraph/test/test_roslogging_user_logger.py b/tools/rosgraph/test/test_roslogging_user_logger.py
-index 4ac4f8291..1c3cb5df5 100644
---- a/tools/rosgraph/test/test_roslogging_user_logger.py
-+++ b/tools/rosgraph/test/test_roslogging_user_logger.py
-@@ -51,12 +51,16 @@
-
- # set user defined custom logger
- class UserCustomLogger(logging.Logger):
-- def findCaller(self):
-+ def findCaller(self, stack_info=False):
- """Returns static caller.
-
- This method is being overwritten in rosgraph.roslogging.
- """
-- return '', '', ''
-+ if sys.version_info > (3, 2):
-+ # Dummy last argument to match Python3 return type
-+ return '', '', '', None
-+ else:
-+ return '', '', ''
-
- def _log(self, level, msg, args, exc_info=None, extra=None):
- """Write log with ROS_IP.
diff --git a/dev-ros/rosgraph/files/py3.patch b/dev-ros/rosgraph/files/py3.patch
deleted file mode 100644
index 45798c1d618e..000000000000
--- a/dev-ros/rosgraph/files/py3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001
-From: Dirk Thomas
-Date: Tue, 6 Aug 2019 12:50:24 -0700
-Subject: [PATCH] more Python 3 compatibility (#1782)
-
----
- test/test_rosmaster/test/nodes/testAllCommonFlows | 2 +-
- test/test_rosmaster/test/nodes/testMaster | 2 +-
- test/test_rosmaster/test/nodes/testSlave | 2 +-
- test/test_rospy/test/unit/test_genmsg_py.py | 8 +++++++-
- tools/rosgraph/test/test_roslogging.py | 5 ++++-
- tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++-
- tools/roslaunch/src/roslaunch/depends.py | 8 ++++----
- 7 files changed, 22 insertions(+), 10 deletions(-)
-
-diff --git a/tools/rosgraph/test/test_roslogging.py b/tools/rosgraph/test/test_roslogging.py
-index f9e618f87..ca38c80e8 100644
---- a/tools/rosgraph/test/test_roslogging.py
-+++ b/tools/rosgraph/test/test_roslogging.py
-@@ -32,7 +32,10 @@
-
- import logging
- import os
--from StringIO import StringIO
-+try:
-+ from cStringIO import StringIO
-+except ImportError:
-+ from io import StringIO
- import sys
-
- import re
-diff --git a/tools/rosgraph/test/test_roslogging_user_logger.py b/tools/rosgraph/test/test_roslogging_user_logger.py
-index 62051638a..4ac4f8291 100644
---- a/tools/rosgraph/test/test_roslogging_user_logger.py
-+++ b/tools/rosgraph/test/test_roslogging_user_logger.py
-@@ -38,7 +38,10 @@
-
- import logging
- import os
--from StringIO import StringIO
-+try:
-+ from cStringIO import StringIO
-+except ImportError:
-+ from io import StringIO
- import sys
-
- from nose.tools import assert_regexp_matches
diff --git a/dev-ros/rosgraph/files/yaml.patch b/dev-ros/rosgraph/files/yaml.patch
deleted file mode 100644
index 32ea589c8e49..000000000000
--- a/dev-ros/rosgraph/files/yaml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py | 2 +-
- .../test/test_roslib_message.py | 2 +-
- .../client_verification/test_slave_api.py | 2 +-
- test/test_rosparam/test/check_rosparam.py | 8 ++---
- .../check_rosparam_command_line_online.py | 2 +-
- .../check_rosservice_command_line_online.py | 4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py | 2 +-
- tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
- tools/roslaunch/src/roslaunch/loader.py | 4 +--
- .../test/unit/test_roslaunch_dump_params.py | 4 +--
- tools/rosparam/src/rosparam/__init__.py | 7 ++++-
- tools/rosservice/src/rosservice/__init__.py | 4 +--
- tools/rostopic/src/rostopic/__init__.py | 6 ++--
- tools/topic_tools/scripts/relay_field | 2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/tools/rosgraph/src/rosgraph/roslogging.py b/tools/rosgraph/src/rosgraph/roslogging.py
-index ffe975dab..bbf1d9f49 100644
---- a/tools/rosgraph/src/rosgraph/roslogging.py
-+++ b/tools/rosgraph/src/rosgraph/roslogging.py
-@@ -178,7 +178,7 @@ def configure_logging(logname, level=logging.INFO, filename=None, env=None):
- os.environ['ROS_LOG_FILENAME'] = log_filename
- if config_file.endswith(('.yaml', '.yml')):
- with open(config_file) as f:
-- dict_conf = yaml.load(f)
-+ dict_conf = yaml.safe_load(f)
- dict_conf.setdefault('version', 1)
- logging.config.dictConfig(dict_conf)
- else:
diff --git a/dev-ros/rosgraph/rosgraph-1.14.3-r1.ebuild b/dev-ros/rosgraph/rosgraph-1.14.3-r1.ebuild
deleted file mode 100644
index a3f0ad00a7c1..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
-PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" "${FILESDIR}/py3-2.patch" )
diff --git a/dev-ros/rosgraph/rosgraph-1.15.4.ebuild b/dev-ros/rosgraph/rosgraph-1.15.4.ebuild
deleted file mode 100644
index 49cca14bf4f3..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.15.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph/rosgraph-1.15.7.ebuild b/dev-ros/rosgraph/rosgraph-1.15.7.ebuild
new file mode 100644
index 000000000000..5371ed906b58
--- /dev/null
+++ b/dev-ros/rosgraph/rosgraph-1.15.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Prints information about the ROS Computation Graph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-python/netifaces[${PYTHON_USEDEP}]
+ dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph/rosgraph-9999.ebuild b/dev-ros/rosgraph/rosgraph-9999.ebuild
index 49cca14bf4f3..5371ed906b58 100644
--- a/dev-ros/rosgraph/rosgraph-9999.ebuild
+++ b/dev-ros/rosgraph/rosgraph-9999.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
ROS_SUBDIR=tools/${PN}
inherit ros-catkin
diff --git a/dev-ros/rosgraph_msgs/Manifest b/dev-ros/rosgraph_msgs/Manifest
index ce83fe460424..b936c1721c85 100644
--- a/dev-ros/rosgraph_msgs/Manifest
+++ b/dev-ros/rosgraph_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST ros_comm_msgs-1.11.2.tar.gz 2482 BLAKE2B 886f0bbbb00b0a291ba32ade834e466e03063087e0feaed9d7edbebb2871bc6ec314b4259bb728e662138384d455d5bbec5df49c5b1b6a448e98339cb3516ab7 SHA512 4750e234725b3cad8e2deb681f827e2f979f50bdfc0fccf4100288d2f663a68561f363702340b4569572837462cf6578f51213362d18b9694f6952fdcede1e6e
-EBUILD rosgraph_msgs-1.11.2.ebuild 448 BLAKE2B 000d1ed9530687bb7c03e9cec40bcdd13c9275f46bbb323f1a31881e8465f340f22491dad8b5cf0f23dfd38183b99a1f17ee46dc6e50ad0cddf985800d0df738 SHA512 77af4285014f5238542468f2d31ce263e9b29ce7402b5bd6babf7de9d4ae32ba54333481f29744eceed93befcdffe26bfe8208f22ce2af8223429fc8dd13b41d
-EBUILD rosgraph_msgs-9999.ebuild 448 BLAKE2B 000d1ed9530687bb7c03e9cec40bcdd13c9275f46bbb323f1a31881e8465f340f22491dad8b5cf0f23dfd38183b99a1f17ee46dc6e50ad0cddf985800d0df738 SHA512 77af4285014f5238542468f2d31ce263e9b29ce7402b5bd6babf7de9d4ae32ba54333481f29744eceed93befcdffe26bfe8208f22ce2af8223429fc8dd13b41d
+DIST ros_comm_msgs-1.11.3.tar.gz 2483 BLAKE2B dd6753d0cd5f285cce9343e29c3c593260708bcc7627850564fe6e3975511b55359ee790d6ddf6066e8433c2fa03bc576d9f7ec41ee0a5a362a9e42be2c87e65 SHA512 e7afef3326fbbfa9435ecaed9a553de74d694def975e5e2bdaff6cc671c8001cdef540defb90df936c0731bfa5d3d7d6e00300847271cd8d3c00ec59b24f1207
+EBUILD rosgraph_msgs-1.11.3.ebuild 408 BLAKE2B 55c40e3d4d0d67e6ed7b8e37af99f8c7e9f16286169908380e431b2787196531ca679c3338d77004e96cb56fe7ecb6978ad0a4554fd7148ae634f70d036e47ea SHA512 f92fd23faeb53072f195af3bb309a4439e6e978045467c1cbdca0c7ab8c04246ef38d58f3f1bf5be2ccee4fe9b1cfefe919869c84f648c30327c890b171b141c
+EBUILD rosgraph_msgs-9999.ebuild 408 BLAKE2B 55c40e3d4d0d67e6ed7b8e37af99f8c7e9f16286169908380e431b2787196531ca679c3338d77004e96cb56fe7ecb6978ad0a4554fd7148ae634f70d036e47ea SHA512 f92fd23faeb53072f195af3bb309a4439e6e978045467c1cbdca0c7ab8c04246ef38d58f3f1bf5be2ccee4fe9b1cfefe919869c84f648c30327c890b171b141c
MISC metadata.xml 331 BLAKE2B bb21abfb707c7a52640eeb013b04df43dd72b32d8f048207f2d0d0e23732dd2c5727a3bfbc6a1a84d7c4885ba560e15b1dcca0089b1a0e301d2491cc117b9c5d SHA512 365791913afec69e27e8c220acd643eb6ac8e13419a04d38a672a9ba50e696719563b246207abe70a1b945e42c1b61c3348f543f4d7a66b0b6cf62668769cf64
diff --git a/dev-ros/rosgraph_msgs/rosgraph_msgs-1.11.2.ebuild b/dev-ros/rosgraph_msgs/rosgraph_msgs-1.11.2.ebuild
deleted file mode 100644
index 7cee75bd3604..000000000000
--- a/dev-ros/rosgraph_msgs/rosgraph_msgs-1.11.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/ros_comm_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages relating to ROS comm"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosgraph_msgs/rosgraph_msgs-1.11.3.ebuild b/dev-ros/rosgraph_msgs/rosgraph_msgs-1.11.3.ebuild
new file mode 100644
index 000000000000..9cc4b761683f
--- /dev/null
+++ b/dev-ros/rosgraph_msgs/rosgraph_msgs-1.11.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/ros_comm_msgs"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages relating to ROS comm"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosgraph_msgs/rosgraph_msgs-9999.ebuild b/dev-ros/rosgraph_msgs/rosgraph_msgs-9999.ebuild
index 7cee75bd3604..9cc4b761683f 100644
--- a/dev-ros/rosgraph_msgs/rosgraph_msgs-9999.ebuild
+++ b/dev-ros/rosgraph_msgs/rosgraph_msgs-9999.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/ros_comm_msgs"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
index c44735ec8b20..cc429971665e 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -1,16 +1,10 @@
AUX 40roslaunch 41 BLAKE2B a07c8484065add0cec5d9cf2e586a7a1fff3b7df575a904f224eeb20fbf88c707212458e53f45799822703fad633efd944f8c0cab35fb1e22c701d40c17d8efa SHA512 1b32e0967267e2d6f40583f3463e989f52ff2aeb243fd3b96647e946c95bab553a0b969407579ea3b700234fd554ff23a4208562ffb741c0a5a47a42da28525a
-AUX py3-2.patch 1430 BLAKE2B bbb55f75603556a96e4a573039c20aa41caea7c3758a2a994e80d8dd4175c97467c740cc1319d61812301fe74956a63e5385eb2220573e36a6f557e9ba1b97ed SHA512 57c8853bf8130c2c5050d1191e197f37e38937ad524e01de551d0f1d018b507af3bb6de463381f743740ca8c52cdd1ed2ed85a9fa6830960a3c3b6661686c3ad
-AUX py3.patch 1989 BLAKE2B 635135fc80d5f28c7953fd28105793b74ef51384bdc269a3b45c85e5519a700014ff02a2eedc38aa8dc5642ca269421d5521197957f5ccbae8fe42d88bde18a1 SHA512 5ebf4e0bf6d5f814dd9ee4fee868127dd7fb13b78f488bed7875d1a0102ba7ff63b848d843d9a94eeee13aa79694b0f6d8a2a2bbc74294861a27dc3b8255248a
AUX roscore.confd 9 BLAKE2B 89bba6f2d5d004cd5d0e3bb931d039e54e5389f21538c4210924c2e52d9287b2191e1ae5f94641658fb95fef10bf55e261e2d20e702974cc823988609e27781a SHA512 91af98d3c1f567572e0d995b68f268cefe8abaff46b58499fdd11845809947e858c8d133c6b4428115f0a62db6eb847495bf462619a7fa7c233bf3a97dc9f0bc
AUX roscore.initd 533 BLAKE2B 2ff10e03a6b75128fd72a98022a040b93c32ddba6782912133e4164e50427a37f77c5911cd1a50082ba33f90cc7cc6983d2d4eff4ca1ef86c07d3e2ebabfbce6 SHA512 8a43dd2ec83c24db1c00f4e849fa3e6193d348c6c3e4cae0317717d1d08cd1da6cbc37dbfdd338b9d2d77d2bf852d93736214c7d3c31e6dba3b46627e3d0b410
AUX roscore.xml.in 347 BLAKE2B 05c90bd6a2cffeaab16d1fb576e2cbe5768a848c5b6231af930e3e01a32dc3228dfc60aeb4c1d6efe05f8245a948edd2314dcb550f9e80d1acd36461c347ce38 SHA512 fff18b8f4ffdf3f3e6cdc3b33cdb386dabaab769f3bac995cb3c29243c8380b13898cd5892026e9dee459f88f4f05886c052696b2f081fbbb393ade148fda0f6
AUX roslaunch.confd 46 BLAKE2B 24fcab885cf07185c751da12863e3af0ac8f1097a636c3641be1b6357e26b5178d13ee42d04bbacea27763df075f5436813afc2025dd9013461059b0c5feacd9 SHA512 0a86b0beb7b4bad2c01f3814070d27a3c85a99629ab26fa3aa6cce19d178d500c912665b152403cf7301f210e3cf9e6bd03103c3654b1ef61dae165ba5ac704d
AUX roslaunch.initd 915 BLAKE2B 11f2c6f2db2ad1084332a1b704a90ed3a3fc9fe671f96f6ca74bbabdab3b7f22bed96c077dd994e3c3fc54eb299e93001167fe16e688eb062033f3da86ac168d SHA512 4f8bb2dfe085d09245ec2343e423e1dacbd02108868c5d9523d63929c939b753f45ce963d5d44b5ad0f547f7d85b82ea6d3a80f8984dfe72ade7f8a5372c850c
-AUX timeout.patch 623 BLAKE2B 0889396c4a38d3f62fd928dcd2f8d982a7fb070da0912d16f68ff61bf15c0d10f7b4f8dc70f8df9d946608c6755dbcfeb770d9cbc6e5acc9dfd0e3d509177258 SHA512 56ded8178faab6d74245479afe013fbffc984037263cae502ec411ce5e681efa6a8d11fc3b2083673df3e69a011db0c2e0992c5900fa5409338f7be84b0ea843
-AUX yaml.patch 1951 BLAKE2B cb6a66bb788221cd666d199d28a9844e10e61955e254bbd73e93e4595a1b6f3f9bbd292bf2781c46b5f3a0e4d052b79691a896a4fb922ab7db10918d61c86519 SHA512 964212c13d5cdef7fa0b19a947d1740b0782eac35e62e9bac41bc5e4fa33ebb3e15ca7ba6007ec97df2903237c250cdbc87d438804bdf5648ecec55f24ccd21d
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD roslaunch-1.14.3-r2.ebuild 1500 BLAKE2B 829c844a6f728b8dac5f494ba96c82bd9eadb500430e6f0bf7f393c57e50d23b5858da818b628d756949849580f5e66fffb94684b30dd5bb4b1f20c2250c65a6 SHA512 bb54582f417f932e4dac68d7214acd7c0343ad4681cb54b8167417b52af02f0adb1160c0013a0dcd96856052349032b148bf01cdeb4c26cfafa88154ab828a3a
-EBUILD roslaunch-1.15.4.ebuild 1425 BLAKE2B 94a0208aa65bfa08d0c7a51d84bed57f7b51ee767ec1181a5016299ac57867c3ba8b3f75d4ef82b665d89043365b0b409171d937816b093002b8cda0ab6358d7 SHA512 5e9e26393d979cf1ff0b5167b9ed2cf7b9e561d1cde8a744cb77cb9872c8beac5f58fbbc08a646cd65a91d7365139f4e51819a3120ff2f4db350407c0b58382c
-EBUILD roslaunch-9999.ebuild 1425 BLAKE2B 94a0208aa65bfa08d0c7a51d84bed57f7b51ee767ec1181a5016299ac57867c3ba8b3f75d4ef82b665d89043365b0b409171d937816b093002b8cda0ab6358d7 SHA512 5e9e26393d979cf1ff0b5167b9ed2cf7b9e561d1cde8a744cb77cb9872c8beac5f58fbbc08a646cd65a91d7365139f4e51819a3120ff2f4db350407c0b58382c
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD roslaunch-1.15.7.ebuild 1345 BLAKE2B c57799a052cdb29ff9b421657e00e1f5273a4468f851795309f5d92fbdaedbd6696b95c43e55323181f54d0a7a9f740d1d71a8089abde8eae48bdb0ba0ea7a66 SHA512 ddc4264a7804fbb554af4cc0c67e20809eb011617dd05a3eefcae2090d94580ff15f214f783f904471bfde765efd20452411751143fee309953d6d0774fe5cbb
+EBUILD roslaunch-9999.ebuild 1345 BLAKE2B c57799a052cdb29ff9b421657e00e1f5273a4468f851795309f5d92fbdaedbd6696b95c43e55323181f54d0a7a9f740d1d71a8089abde8eae48bdb0ba0ea7a66 SHA512 ddc4264a7804fbb554af4cc0c67e20809eb011617dd05a3eefcae2090d94580ff15f214f783f904471bfde765efd20452411751143fee309953d6d0774fe5cbb
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslaunch/files/py3-2.patch b/dev-ros/roslaunch/files/py3-2.patch
deleted file mode 100644
index d3ae600e4d7e..000000000000
--- a/dev-ros/roslaunch/files/py3-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
-From: Dirk Thomas
-Date: Tue, 6 Aug 2019 16:06:51 -0700
-Subject: [PATCH] more Python 3 compatibility (#1783)
-
----
- test/test_rospy/test/unit/test_genmsg_py.py | 6 +--
- tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
- .../test/test_roslogging_user_logger.py | 8 +++-
- tools/roslaunch/test/unit/test_xmlloader.py | 2 +-
- tools/rosmsg/src/rosmsg/__init__.py | 2 +-
- tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
- .../test/test_rosmsgproto_command_line.py | 20 ++++----
- .../test_rostopic_command_line_offline.py | 44 +++++++++---------
- 8 files changed, 67 insertions(+), 63 deletions(-)
-
-diff --git a/tools/roslaunch/test/unit/test_xmlloader.py b/tools/roslaunch/test/unit/test_xmlloader.py
-index ac30189d0..f582ec230 100644
---- a/tools/roslaunch/test/unit/test_xmlloader.py
-+++ b/tools/roslaunch/test/unit/test_xmlloader.py
-@@ -218,7 +218,7 @@ def test_params(self):
- p = [p for p in mock.params if p.key == '/configfile'][0]
- self.assertEquals(contents, p.value, 1)
- p = [p for p in mock.params if p.key == '/binaryfile'][0]
-- self.assertEquals(Binary(contents), p.value, 1)
-+ self.assertEquals(Binary(contents.encode()), p.value, 1)
-
- f = open(os.path.join(get_example_path(), 'example.launch'))
- try:
diff --git a/dev-ros/roslaunch/files/py3.patch b/dev-ros/roslaunch/files/py3.patch
deleted file mode 100644
index 8fa2c6e2fab2..000000000000
--- a/dev-ros/roslaunch/files/py3.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001
-From: Dirk Thomas
-Date: Tue, 6 Aug 2019 12:50:24 -0700
-Subject: [PATCH] more Python 3 compatibility (#1782)
-
----
- test/test_rosmaster/test/nodes/testAllCommonFlows | 2 +-
- test/test_rosmaster/test/nodes/testMaster | 2 +-
- test/test_rosmaster/test/nodes/testSlave | 2 +-
- test/test_rospy/test/unit/test_genmsg_py.py | 8 +++++++-
- tools/rosgraph/test/test_roslogging.py | 5 ++++-
- tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++-
- tools/roslaunch/src/roslaunch/depends.py | 8 ++++----
- 7 files changed, 22 insertions(+), 10 deletions(-)
-
-diff --git a/tools/roslaunch/src/roslaunch/depends.py b/tools/roslaunch/src/roslaunch/depends.py
-index a3fbf7a41..91ae26998 100644
---- a/tools/roslaunch/src/roslaunch/depends.py
-+++ b/tools/roslaunch/src/roslaunch/depends.py
-@@ -86,21 +86,21 @@ def __str__(self):
-
- def _get_arg_value(tag, context):
- name = tag.attributes['name'].value
-- if tag.attributes.has_key('value'):
-+ if 'value' in tag.attributes.keys():
- return resolve_args(tag.attributes['value'].value, context)
- elif name in context['arg']:
- return context['arg'][name]
-- elif tag.attributes.has_key('default'):
-+ elif 'default' in tag.attributes.keys():
- return resolve_args(tag.attributes['default'].value, context)
- else:
- raise RoslaunchDepsException("No value for arg [%s]"%(name))
-
- def _check_ifunless(tag, context):
-- if tag.attributes.has_key('if'):
-+ if 'if' in tag.attributes.keys():
- val = resolve_args(tag.attributes['if'].value, context)
- if not convert_value(val, 'bool'):
- return False
-- elif tag.attributes.has_key('unless'):
-+ elif 'unless' in tag.attributes.keys():
- val = resolve_args(tag.attributes['unless'].value, context)
- if convert_value(val, 'bool'):
- return False
diff --git a/dev-ros/roslaunch/files/timeout.patch b/dev-ros/roslaunch/files/timeout.patch
deleted file mode 100644
index 169b12813c70..000000000000
--- a/dev-ros/roslaunch/files/timeout.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Slow HW like the raspberry pi easily hit this timeout over NFS.
-Increase it to 1 min.
-
-diff --git a/tools/roslaunch/src/roslaunch/launch.py b/tools/roslaunch/src/roslaunch/launch.py
-index 9a3b931..8e33c0c 100644
---- a/tools/roslaunch/src/roslaunch/launch.py
-+++ b/tools/roslaunch/src/roslaunch/launch.py
-@@ -57,8 +57,8 @@ from roslaunch.pmon import start_process_monitor, ProcessListener
-
- from roslaunch.rlutil import update_terminal_name
-
--_TIMEOUT_MASTER_START = 10.0 #seconds
--_TIMEOUT_MASTER_STOP = 10.0 #seconds
-+_TIMEOUT_MASTER_START = 60.0 #seconds
-+_TIMEOUT_MASTER_STOP = 60.0 #seconds
-
- _ID = '/roslaunch'
-
diff --git a/dev-ros/roslaunch/files/yaml.patch b/dev-ros/roslaunch/files/yaml.patch
deleted file mode 100644
index 135e9927c408..000000000000
--- a/dev-ros/roslaunch/files/yaml.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: roslaunch/src/roslaunch/loader.py
-===================================================================
---- roslaunch.orig/src/roslaunch/loader.py
-+++ roslaunch/src/roslaunch/loader.py
-@@ -98,7 +98,7 @@ def convert_value(value, type_):
- raise ValueError("%s is not a '%s' type"%(value, type_))
- elif type_ == 'yaml':
- try:
-- return yaml.load(value)
-+ return yaml.safe_load(value)
- except yaml.parser.ParserError as e:
- raise ValueError(e)
- else:
-@@ -409,7 +409,7 @@ class Loader(object):
- if rosparam is None:
- import rosparam
- try:
-- data = yaml.load(text)
-+ data = yaml.safe_load(text)
- # #3162: if there is no YAML, load() will return an
- # empty string. We want an empty dictionary instead
- # for our representation of empty.
-Index: roslaunch/test/unit/test_roslaunch_dump_params.py
-===================================================================
---- roslaunch.orig/test/unit/test_roslaunch_dump_params.py
-+++ roslaunch/test/unit/test_roslaunch_dump_params.py
-@@ -53,7 +53,7 @@ class TestDumpParams(unittest.TestCase):
- o, e = p.communicate()
- self.assert_(p.returncode == 0, "Return code nonzero for param dump! Code: %d" % (p.returncode))
-
-- self.assertEquals({'/noop': 'noop'}, yaml.load(o))
-+ self.assertEquals({'/noop': 'noop'}, yaml.safe_load(o))
-
- p = Popen([cmd, '--dump-params', 'roslaunch', 'test-dump-rosparam.launch'], stdout = PIPE)
- o, e = p.communicate()
-@@ -95,7 +95,7 @@ class TestDumpParams(unittest.TestCase):
- '/noparam1': 'value1',
- '/noparam2': 'value2',
- }
-- output_val = yaml.load(o)
-+ output_val = yaml.safe_load(o)
- if not val == output_val:
- for k, v in val.items():
- if k not in output_val:
diff --git a/dev-ros/roslaunch/roslaunch-1.14.3-r2.ebuild b/dev-ros/roslaunch/roslaunch-1.14.3-r2.ebuild
deleted file mode 100644
index 61eb48c58d38..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.14.3-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/rosclean[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]
- dev-ros/rosout
-"
-DEPEND="${RDEPEND}
- test? (
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/test_rosmaster
- )"
-PATCHES=( "${FILESDIR}/timeout.patch" "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" "${FILESDIR}/py3-2.patch" )
-
-src_test() {
- rosdep update
- ros-catkin_src_test
-}
-
-src_install() {
- ros-catkin_src_install
-
- dodir /etc/ros
- sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
- newinitd "${FILESDIR}/roscore.initd" roscore
- newconfd "${FILESDIR}/roscore.confd" roscore
-
- newinitd "${FILESDIR}/roslaunch.initd" roslaunch
- newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
- doenvd "${FILESDIR}/40roslaunch"
-
- # Needed by test_roslaunch
- insinto /usr/share/${PN}
- doins test/xml/noop.launch
-}
-
-pkg_preinst() {
- enewgroup ros
- enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.15.4.ebuild b/dev-ros/roslaunch/roslaunch-1.15.4.ebuild
deleted file mode 100644
index 4538fcdb1d63..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.15.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/rosclean[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]
- dev-ros/rosout
-"
-DEPEND="${RDEPEND}
- test? (
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/test_rosmaster
- )"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
- rosdep update
- ros-catkin_src_test
-}
-
-src_install() {
- ros-catkin_src_install
-
- dodir /etc/ros
- sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
- newinitd "${FILESDIR}/roscore.initd" roscore
- newconfd "${FILESDIR}/roscore.confd" roscore
-
- newinitd "${FILESDIR}/roslaunch.initd" roslaunch
- newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
- doenvd "${FILESDIR}/40roslaunch"
-
- # Needed by test_roslaunch
- insinto /usr/share/${PN}
- doins test/xml/noop.launch
-}
-
-pkg_preinst() {
- enewgroup ros
- enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.15.7.ebuild b/dev-ros/roslaunch/roslaunch-1.15.7.ebuild
new file mode 100644
index 000000000000..a3f2abeb8889
--- /dev/null
+++ b/dev-ros/roslaunch/roslaunch-1.15.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin user
+
+DESCRIPTION="Tool for easily launching multiple ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-python/rospkg[${PYTHON_USEDEP}]
+ dev-ros/rosclean[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosparam[${PYTHON_USEDEP}]
+ dev-ros/rosmaster[${PYTHON_USEDEP}]
+ dev-ros/rosout
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-util/rosdep[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-ros/test_rosmaster
+ )"
+
+src_test() {
+ rosdep update
+ ros-catkin_src_test
+}
+
+src_install() {
+ ros-catkin_src_install
+
+ dodir /etc/ros
+ sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
+
+ newinitd "${FILESDIR}/roscore.initd" roscore
+ newconfd "${FILESDIR}/roscore.confd" roscore
+
+ newinitd "${FILESDIR}/roslaunch.initd" roslaunch
+ newconfd "${FILESDIR}/roslaunch.confd" roslaunch
+
+ doenvd "${FILESDIR}/40roslaunch"
+
+ # Needed by test_roslaunch
+ insinto /usr/share/${PN}
+ doins test/xml/noop.launch
+}
+
+pkg_preinst() {
+ enewgroup ros
+ enewuser ros -1 -1 /home/ros ros
+}
diff --git a/dev-ros/roslaunch/roslaunch-9999.ebuild b/dev-ros/roslaunch/roslaunch-9999.ebuild
index 4538fcdb1d63..a3f2abeb8889 100644
--- a/dev-ros/roslaunch/roslaunch-9999.ebuild
+++ b/dev-ros/roslaunch/roslaunch-9999.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
inherit ros-catkin user
@@ -31,7 +30,6 @@ DEPEND="${RDEPEND}
dev-python/nose[${PYTHON_USEDEP}]
dev-ros/test_rosmaster
)"
-PATCHES=( "${FILESDIR}/timeout.patch" )
src_test() {
rosdep update
diff --git a/dev-ros/roslz4/Manifest b/dev-ros/roslz4/Manifest
index b7aed5db2bbd..3105a4e96055 100644
--- a/dev-ros/roslz4/Manifest
+++ b/dev-ros/roslz4/Manifest
@@ -1,20 +1,4 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD roslz4-1.13.0.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-1.13.1.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-1.13.2.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-1.13.4.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-1.13.5.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-1.13.6.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-1.14.2.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-1.14.3.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-1.15.4.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-9999.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD roslz4-1.15.7.ebuild 431 BLAKE2B 06fa3409ff03cea6f58379d8f7f8a4cb9f56058fdd6895bb94ef1c49086fd1e37135aa4ebbc342194c3136be2fb80d4ab8a42a4f0bd9f38c7010636574148ec2 SHA512 f7524a8880d50ddf4cf77ec683c2a6dae1af2c7622f943cffa257b7fb9d0e56cc0dd814e75b22fb4c38177d4c7df819273c4f0b9243b7c16b0efc856014e1ed1
+EBUILD roslz4-9999.ebuild 431 BLAKE2B 06fa3409ff03cea6f58379d8f7f8a4cb9f56058fdd6895bb94ef1c49086fd1e37135aa4ebbc342194c3136be2fb80d4ab8a42a4f0bd9f38c7010636574148ec2 SHA512 f7524a8880d50ddf4cf77ec683c2a6dae1af2c7622f943cffa257b7fb9d0e56cc0dd814e75b22fb4c38177d4c7df819273c4f0b9243b7c16b0efc856014e1ed1
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslz4/roslz4-1.13.0.ebuild b/dev-ros/roslz4/roslz4-1.13.0.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.13.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/lz4"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.13.1.ebuild b/dev-ros/roslz4/roslz4-1.13.1.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.13.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/lz4"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.13.2.ebuild b/dev-ros/roslz4/roslz4-1.13.2.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.13.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/lz4"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.13.4.ebuild b/dev-ros/roslz4/roslz4-1.13.4.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.13.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/lz4"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.13.5.ebuild b/dev-ros/roslz4/roslz4-1.13.5.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.13.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/lz4"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.13.6.ebuild b/dev-ros/roslz4/roslz4-1.13.6.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.13.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/lz4"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.14.2.ebuild b/dev-ros/roslz4/roslz4-1.14.2.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.14.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/lz4"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.14.3.ebuild b/dev-ros/roslz4/roslz4-1.14.3.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.14.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/lz4"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.15.4.ebuild b/dev-ros/roslz4/roslz4-1.15.4.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.15.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/lz4"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.15.7.ebuild b/dev-ros/roslz4/roslz4-1.15.7.ebuild
new file mode 100644
index 000000000000..9a534f1f2586
--- /dev/null
+++ b/dev-ros/roslz4/roslz4-1.15.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-arch/lz4"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-9999.ebuild b/dev-ros/roslz4/roslz4-9999.ebuild
index acf0fcec87e0..9a534f1f2586 100644
--- a/dev-ros/roslz4/roslz4-9999.ebuild
+++ b/dev-ros/roslz4/roslz4-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/rosmaster/Manifest b/dev-ros/rosmaster/Manifest
index 413b419d58c9..107cb1a82720 100644
--- a/dev-ros/rosmaster/Manifest
+++ b/dev-ros/rosmaster/Manifest
@@ -1,20 +1,4 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosmaster-1.13.0.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-1.13.1.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-1.13.2.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-1.13.4.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-1.13.5.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-1.13.6.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-1.14.2.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-1.14.3.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-1.15.4.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-9999.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD rosmaster-1.15.7.ebuild 453 BLAKE2B 10f157c844b5c01311f3923745de6acc38a3771b612ee936f1cb7f1127b3882e8597fc657e448a7f8d2cc313d3eaecd1c82a77274107456d802bfbe0f11c162c SHA512 7283e3008817ccb7ed41da362ccc34b531af853dff9a9894230db0b717dd378ff7439cc99ce8a00260acd3473373b2edab15678388ccb55d81473cd79a777053
+EBUILD rosmaster-9999.ebuild 453 BLAKE2B 10f157c844b5c01311f3923745de6acc38a3771b612ee936f1cb7f1127b3882e8597fc657e448a7f8d2cc313d3eaecd1c82a77274107456d802bfbe0f11c162c SHA512 7283e3008817ccb7ed41da362ccc34b531af853dff9a9894230db0b717dd378ff7439cc99ce8a00260acd3473373b2edab15678388ccb55d81473cd79a777053
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmaster/rosmaster-1.13.0.ebuild b/dev-ros/rosmaster/rosmaster-1.13.0.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.13.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.13.1.ebuild b/dev-ros/rosmaster/rosmaster-1.13.1.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.13.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.13.2.ebuild b/dev-ros/rosmaster/rosmaster-1.13.2.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.13.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.13.4.ebuild b/dev-ros/rosmaster/rosmaster-1.13.4.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.13.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.13.5.ebuild b/dev-ros/rosmaster/rosmaster-1.13.5.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.13.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.13.6.ebuild b/dev-ros/rosmaster/rosmaster-1.13.6.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.13.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.14.2.ebuild b/dev-ros/rosmaster/rosmaster-1.14.2.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.14.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.14.3.ebuild b/dev-ros/rosmaster/rosmaster-1.14.3.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.14.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.15.4.ebuild b/dev-ros/rosmaster/rosmaster-1.15.4.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.15.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.15.7.ebuild b/dev-ros/rosmaster/rosmaster-1.15.7.ebuild
new file mode 100644
index 000000000000..c8a663583e77
--- /dev/null
+++ b/dev-ros/rosmaster/rosmaster-1.15.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS Master implementation"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-python/defusedxml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-9999.ebuild b/dev-ros/rosmaster/rosmaster-9999.ebuild
index a339d31c4b73..c8a663583e77 100644
--- a/dev-ros/rosmaster/rosmaster-9999.ebuild
+++ b/dev-ros/rosmaster/rosmaster-9999.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
ROS_SUBDIR=tools/${PN}
inherit ros-catkin
diff --git a/dev-ros/rosmsg/Manifest b/dev-ros/rosmsg/Manifest
index 95e19290070d..ea3492d7fc62 100644
--- a/dev-ros/rosmsg/Manifest
+++ b/dev-ros/rosmsg/Manifest
@@ -1,9 +1,4 @@
-AUX norm.patch 1260 BLAKE2B 09c790fa6d31a76d07a44622c514391a30c855c167aa3598f300754ba24249023efef644c397203e66d25c467b6043a6a6f02d9d19d9a23d1b920619d04e7b9e SHA512 3fe87e224a10bd5b3eaafbb370031ee0ca30f3a968742df78fc6319875f1ae374e06d58dd2d47a499065dba2030914ad5b4221b856b18d340f7119b6435b19cb
-AUX py3.patch 12157 BLAKE2B 13c70122c5b790e9d3f54ed9709d01ec4fbb98ba9b0f912d61d016afe265d81abe19e3e8a1b308536019fb995277e0931a0d1238dd1af128059462d7439a132c SHA512 756d32eef5be6e40564654f0bd8eb66295e02af91e3a6f56b995a593a5687fd5e324a5963e68a44a7f19f7fe98eca5717b272533add90710bea46d05912a1066
-AUX tests.patch 811 BLAKE2B 66d61f39aaa4138f1e4ef60c24724216a698d4c355b6830802a176c74cccddd742849377abdd4773c241cf3096d0023fa6ea98aa0a975376fa02d2ba6ea0510e SHA512 3fca6df07aacb5a8230c5990ded10f18127cd92947b3d263042fe49938a224bce0874bc5bc5924a258b116f88f3176c8aedc0ebc92492329c84320d1e2eb20d4
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosmsg-1.14.3-r1.ebuild 685 BLAKE2B 4bba0c3d568621b570992e8c4943e6a3248740f9dbef4658d0b519ff84f8456cf200a5e4a26d78328583f9a113a141e3a3e922b80a77351d86fc18f289751d0b SHA512 a2d87e5b732375bc69f1b74e8b1e2afb2b5234fd5e34cb127e738762605f8fcd72d92624fae274fb67681bd86321dbb96b4c0b2a3ec8f3be3e26dbb6c5a978dd
-EBUILD rosmsg-1.15.4.ebuild 598 BLAKE2B 8618b8067bcb689d8b6fb14cbc7c5a427c1b3d9f9f2eb8bec937d49ee08728e1e3b068340422079f697a809651cc0cc52f40a97333b4912863ac1d94e3cf8df6 SHA512 bf2879ef4ca972720b05abb1a3b14abe49b377b4a4ca8af65b810b411b04febfb974208b1106c39bbeeb60832bd4352610df73b3ee9c68904217018c9403e2fd
-EBUILD rosmsg-9999.ebuild 598 BLAKE2B 8618b8067bcb689d8b6fb14cbc7c5a427c1b3d9f9f2eb8bec937d49ee08728e1e3b068340422079f697a809651cc0cc52f40a97333b4912863ac1d94e3cf8df6 SHA512 bf2879ef4ca972720b05abb1a3b14abe49b377b4a4ca8af65b810b411b04febfb974208b1106c39bbeeb60832bd4352610df73b3ee9c68904217018c9403e2fd
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD rosmsg-1.15.7.ebuild 570 BLAKE2B c7a9f800e8a63bd76f7bfdf588e64b059a66adebaddf015c63ae99af9b9e72013f18aaba2884c714e51022154f5e66c007f3f35fcfd383ee58e3458239a683f7 SHA512 898d9f8846bb86e2e8979fd6442a6f8b290ef132da0f88a13ff5e71591f661c95c028cfc182879df925433b3651265b5ffde77cf22e24d6b5491a45371c3d234
+EBUILD rosmsg-9999.ebuild 570 BLAKE2B c7a9f800e8a63bd76f7bfdf588e64b059a66adebaddf015c63ae99af9b9e72013f18aaba2884c714e51022154f5e66c007f3f35fcfd383ee58e3458239a683f7 SHA512 898d9f8846bb86e2e8979fd6442a6f8b290ef132da0f88a13ff5e71591f661c95c028cfc182879df925433b3651265b5ffde77cf22e24d6b5491a45371c3d234
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmsg/files/norm.patch b/dev-ros/rosmsg/files/norm.patch
deleted file mode 100644
index 530da65fcd24..000000000000
--- a/dev-ros/rosmsg/files/norm.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0648d3019dc2395f61a8a7a3d1bbf790eca98739 Mon Sep 17 00:00:00 2001
-From: James Xu
-Date: Wed, 6 Feb 2019 09:47:54 -0800
-Subject: [PATCH] normalize paths before comparison in rosmsg (#1586)
-
-* normalize paths before comparison in rosmsg
-
-* remove use of normcase and remove path_in_workspaces temp variable
-
-* remove duplicated control
-
-* revert unrelated whitespace changes
-
-* keep order of operands
----
- tools/rosmsg/src/rosmsg/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/rosmsg/src/rosmsg/__init__.py b/tools/rosmsg/src/rosmsg/__init__.py
-index 83b629e7e..4ed7aa542 100644
---- a/tools/rosmsg/src/rosmsg/__init__.py
-+++ b/tools/rosmsg/src/rosmsg/__init__.py
-@@ -551,7 +551,7 @@ def _get_package_paths(pkgname, rospack):
- path = rospack.get_path(pkgname)
- paths.append(path)
- results = find_in_workspaces(search_dirs=['share'], project=pkgname, first_match_only=True, workspace_to_source_spaces=_catkin_workspace_to_source_spaces, source_path_to_packages=_catkin_source_path_to_packages)
-- if results and results[0] != path:
-+ if results and results[0].replace(os.path.sep, '/') != path.replace(os.path.sep, '/'):
- paths.append(results[0])
- return paths
-
diff --git a/dev-ros/rosmsg/files/py3.patch b/dev-ros/rosmsg/files/py3.patch
deleted file mode 100644
index 4cfcb77d2a26..000000000000
--- a/dev-ros/rosmsg/files/py3.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
-From: Dirk Thomas
-Date: Tue, 6 Aug 2019 16:06:51 -0700
-Subject: [PATCH] more Python 3 compatibility (#1783)
-
----
- test/test_rospy/test/unit/test_genmsg_py.py | 6 +--
- tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
- .../test/test_roslogging_user_logger.py | 8 +++-
- tools/roslaunch/test/unit/test_xmlloader.py | 2 +-
- tools/rosmsg/src/rosmsg/__init__.py | 2 +-
- tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
- .../test/test_rosmsgproto_command_line.py | 20 ++++----
- .../test_rostopic_command_line_offline.py | 44 +++++++++---------
- 8 files changed, 67 insertions(+), 63 deletions(-)
-
-diff --git a/tools/rosmsg/src/rosmsg/__init__.py b/tools/rosmsg/src/rosmsg/__init__.py
-index 4ed7aa542..75f5afcbd 100644
---- a/tools/rosmsg/src/rosmsg/__init__.py
-+++ b/tools/rosmsg/src/rosmsg/__init__.py
-@@ -240,7 +240,7 @@ def create_names_filter(names):
- """
- returns a function to use as filter that returns all objects slots except those with names in list.
- """
-- return lambda obj : filter(lambda slotname : not slotname in names, obj.__slots__)
-+ return lambda obj : list(filter(lambda slotname : not slotname in names, obj.__slots__))
-
-
- def init_rosmsg_proto():
-diff --git a/tools/rosmsg/test/test_rosmsg_command_line.py b/tools/rosmsg/test/test_rosmsg_command_line.py
-index 02e31022e..d5515a3ac 100644
---- a/tools/rosmsg/test/test_rosmsg_command_line.py
-+++ b/tools/rosmsg/test/test_rosmsg_command_line.py
-@@ -54,24 +54,24 @@ def test_cmd_help(self):
-
- for cmd in ['rosmsg', 'rossrv']:
- glob_cmd=[os.path.join(_SCRIPT_FOLDER, cmd)]
-- output = Popen(glob_cmd, stdout=PIPE, env=self.new_environ).communicate()[0]
-+ output = Popen(glob_cmd, stdout=PIPE, env=self.new_environ).communicate()[0].decode()
- self.assert_('Commands' in output)
-- output = Popen(glob_cmd+['-h'], stdout=PIPE, env=self.new_environ).communicate()[0]
-+ output = Popen(glob_cmd+['-h'], stdout=PIPE, env=self.new_environ).communicate()[0].decode()
- self.assert_('Commands' in output)
- self.assert_('Traceback' not in output)
- for c in sub:
- self.assert_("%s %s"%(cmd, c) in output, "%s %s"%(cmd, c) + " not in "+ output + " of " + str(glob_cmd))
-
- for c in sub:
-- output = Popen(glob_cmd + [c, '-h'], stdout=PIPE, env=self.new_environ).communicate()[0]
-+ output = Popen(glob_cmd + [c, '-h'], stdout=PIPE, env=self.new_environ).communicate()[0].decode()
- self.assert_('Usage' in output)
- self.assert_("%s %s"%(cmd, c) in output, output)
-
- def test_cmd_packages(self):
- # - single line
-- output1 = Popen(['rosmsg', 'packages', '-s'], stdout=PIPE).communicate()[0]
-+ output1 = Popen(['rosmsg', 'packages', '-s'], stdout=PIPE).communicate()[0].decode()
- # - multi-line
-- output2 = Popen(['rosmsg', 'packages'], stdout=PIPE).communicate()[0]
-+ output2 = Popen(['rosmsg', 'packages'], stdout=PIPE).communicate()[0].decode()
- l1 = [x for x in output1.split() if x]
- l2 = [x.strip() for x in output2.split('\n') if x.strip()]
- self.assertEquals(l1, l2)
-@@ -80,8 +80,8 @@ def test_cmd_packages(self):
- for p in ['std_srvs', 'rosmsg']:
- self.assert_(p not in l1)
-
-- output1 = Popen(['rossrv', 'packages', '-s'], stdout=PIPE).communicate()[0]
-- output2 = Popen(['rossrv', 'packages'], stdout=PIPE).communicate()[0]
-+ output1 = Popen(['rossrv', 'packages', '-s'], stdout=PIPE).communicate()[0].decode()
-+ output2 = Popen(['rossrv', 'packages'], stdout=PIPE).communicate()[0].decode()
- l1 = [x for x in output1.split() if x]
- l2 = [x.strip() for x in output2.split('\n') if x.strip()]
- self.assertEquals(l1, l2)
-@@ -92,14 +92,14 @@ def test_cmd_packages(self):
-
- def test_cmd_list(self):
- # - multi-line
-- output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rosmsg'), 'list'], stdout=PIPE).communicate()[0]
-+ output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rosmsg'), 'list'], stdout=PIPE).communicate()[0].decode()
- l1 = [x.strip() for x in output1.split('\n') if x.strip()]
- for p in ['std_msgs/String', 'test_rosmaster/Floats']:
- self.assert_(p in l1)
- for p in ['std_srvs/Empty', 'roscpp/Empty']:
- self.assert_(p not in l1)
-
-- output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rossrv'), 'list'], stdout=PIPE).communicate()[0]
-+ output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rossrv'), 'list'], stdout=PIPE).communicate()[0].decode()
- l1 = [x.strip() for x in output1.split('\n') if x.strip()]
- for p in ['std_srvs/Empty', 'roscpp/Empty']:
- self.assert_(p in l1)
-@@ -109,9 +109,9 @@ def test_cmd_list(self):
- def test_cmd_package(self):
- # this test is obviously very brittle, but should stabilize as the tests stabilize
- # - single line output
-- output1 = Popen(['rosmsg', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0]
-+ output1 = Popen(['rosmsg', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0].decode()
- # - multi-line output
-- output2 = Popen(['rosmsg', 'package', 'test_rosmaster'], stdout=PIPE).communicate()[0]
-+ output2 = Popen(['rosmsg', 'package', 'test_rosmaster'], stdout=PIPE).communicate()[0].decode()
- l = set([x for x in output1.split() if x])
- l2 = set([x.strip() for x in output2.split('\n') if x.strip()])
- self.assertEquals(l, l2)
-@@ -121,8 +121,8 @@ def test_cmd_package(self):
- 'test_rosmaster/RosmsgC']:
- self.assertTrue(m in l, l)
-
-- output = Popen(['rossrv', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0]
-- output2 = Popen(['rossrv', 'package','test_rosmaster'], stdout=PIPE).communicate()[0]
-+ output = Popen(['rossrv', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0].decode()
-+ output2 = Popen(['rossrv', 'package','test_rosmaster'], stdout=PIPE).communicate()[0].decode()
- l = set([x for x in output.split() if x])
- l2 = set([x.strip() for x in output2.split('\n') if x.strip()])
- self.assertEquals(l, l2)
-@@ -132,14 +132,14 @@ def test_cmd_package(self):
-
- ## test that the rosmsg/rossrv show command works
- def test_cmd_show(self):
-- output = Popen(['rosmsg', 'show', 'std_msgs/String'], stdout=PIPE).communicate()[0]
-+ output = Popen(['rosmsg', 'show', 'std_msgs/String'], stdout=PIPE).communicate()[0].decode()
- self.assertEquals('string data', output.strip())
-
-- output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0]
-+ output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0].decode()
- self.assertEquals('---', output.strip())
-- output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0]
-+ output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0].decode()
- self.assertEquals('---', output.strip())
-- output = Popen(['rossrv', 'show', 'test_rosmaster/AddTwoInts'], stdout=PIPE).communicate()[0]
-+ output = Popen(['rossrv', 'show', 'test_rosmaster/AddTwoInts'], stdout=PIPE).communicate()[0].decode()
- self.assertEquals('int64 a\nint64 b\n---\nint64 sum', output.strip())
-
- # test against test_rosmsg package
-@@ -159,20 +159,20 @@ def test_cmd_show(self):
- text = text+'\n' # running command adds one new line
- text_raw = text_raw+'\n'
- type_ =test_message_package+'/'+t
-- output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0]
-+ output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0].decode()
- self.assertEquals(text, output)
-- output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE).communicate()[0]
-+ output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE).communicate()[0].decode()
- self.assertEquals(text_raw, output)
-- output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0]
-+ output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0].decode()
- self.assertEquals(text_raw, output)
-
- # test as search
- type_ = t
- text = "[test_rosmaster/%s]:\n%s"%(t, text)
- text_raw = "[test_rosmaster/%s]:\n%s"%(t, text_raw)
-- output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0]
-+ output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0].decode()
- self.assertEquals(text, output)
- output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE, stderr=PIPE).communicate()
-- self.assertEquals(text_raw, output[0], "Failed: %s"%(str(output)))
-- output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0]
-+ self.assertEquals(text_raw, output[0].decode(), "Failed: %s"%(str(output)))
-+ output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0].decode()
- self.assertEquals(text_raw, output)
-diff --git a/tools/rosmsg/test/test_rosmsgproto_command_line.py b/tools/rosmsg/test/test_rosmsgproto_command_line.py
-index b5b555e78..b4aa0c5b3 100644
---- a/tools/rosmsg/test/test_rosmsgproto_command_line.py
-+++ b/tools/rosmsg/test/test_rosmsgproto_command_line.py
-@@ -67,37 +67,37 @@ def testFail(self):
- cmd.extend(["msg", "foo123barxyz"])
- call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
- (output, erroutput) = call.communicate()
-- self.assertEqual('', output)
-- self.assertTrue('Unknown message name foo123barxyz' in erroutput)
-+ self.assertEqual(b'', output)
-+ self.assertTrue('Unknown message name foo123barxyz' in erroutput.decode())
-
- def testSilentFail(self):
- cmd = copy.copy(ROSMSGPROTO_FN)
- cmd.extend(["msg", "-s", "foo123barxyz"])
- call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
- (output, erroutput) = call.communicate()
-- self.assertEqual('', output)
-- self.assertEqual('', erroutput)
-+ self.assertEqual(b'', output)
-+ self.assertEqual(b'', erroutput)
-
- def testSilentFailCpp(self):
- cmd = copy.copy(ROSMSGPROTO_FN)
- cmd.extend(["msg", "-s", "foo123barxyz::bar"])
- call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
- (output, erroutput) = call.communicate()
-- self.assertEqual('', output)
-- self.assertEqual('', erroutput)
-+ self.assertEqual(b'', output)
-+ self.assertEqual(b'', erroutput)
-
- def testSilentFailDot(self):
- cmd = copy.copy(ROSMSGPROTO_FN)
- cmd.extend(["msg", "-s", "foo123barxyz.bar"])
- call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
- (output, erroutput) = call.communicate()
-- self.assertEqual('', output)
-- self.assertEqual('', erroutput)
-+ self.assertEqual(b'', output)
-+ self.assertEqual(b'', erroutput)
-
- def testSilentFailMode(self):
- cmd = copy.copy(ROSMSGPROTO_FN)
- cmd.extend(["msgfoobar", "-s", "foo123barxyz.bar"])
- call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
- (output, erroutput) = call.communicate()
-- self.assertEqual('', output)
-- self.assertEqual('', erroutput)
-+ self.assertEqual(b'', output)
-+ self.assertEqual(b'', erroutput)
diff --git a/dev-ros/rosmsg/files/tests.patch b/dev-ros/rosmsg/files/tests.patch
deleted file mode 100644
index f8b514b4e127..000000000000
--- a/dev-ros/rosmsg/files/tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: rosmsg/test/test_rosmsg_command_line.py
-===================================================================
---- rosmsg.orig/test/test_rosmsg_command_line.py
-+++ rosmsg/test/test_rosmsg_command_line.py
-@@ -168,8 +168,8 @@ class TestRosmsg(unittest.TestCase):
-
- # test as search
- type_ = t
-- text = "[test_rosmaster/%s]:\n%s"%(t, text)
-- text_raw = "[test_rosmaster/%s]:\n%s"%(t, text_raw)
-+ text = ("[test_rosmaster/%s]:\n%s"%(t, text))*2
-+ text_raw = ("[test_rosmaster/%s]:\n%s"%(t, text_raw))*2
- output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0].decode()
- self.assertEquals(text, output)
- output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE, stderr=PIPE).communicate()
diff --git a/dev-ros/rosmsg/rosmsg-1.14.3-r1.ebuild b/dev-ros/rosmsg/rosmsg-1.14.3-r1.ebuild
deleted file mode 100644
index a76abe4007fc..000000000000
--- a/dev-ros/rosmsg/rosmsg-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tools for displaying information about message and services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosbag[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/test_rosmaster[${PYTHON_USEDEP}] )
-"
-PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/norm.patch" "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/rosmsg/rosmsg-1.15.4.ebuild b/dev-ros/rosmsg/rosmsg-1.15.4.ebuild
deleted file mode 100644
index 941834eadacc..000000000000
--- a/dev-ros/rosmsg/rosmsg-1.15.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tools for displaying information about message and services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosbag[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/test_rosmaster[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosmsg/rosmsg-1.15.7.ebuild b/dev-ros/rosmsg/rosmsg-1.15.7.ebuild
new file mode 100644
index 000000000000..fb932a115bc9
--- /dev/null
+++ b/dev-ros/rosmsg/rosmsg-1.15.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tools for displaying information about message and services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/genmsg[${PYTHON_USEDEP}]
+ dev-python/rospkg[${PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-ros/rosbag[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/test_rosmaster[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/rosmsg/rosmsg-9999.ebuild b/dev-ros/rosmsg/rosmsg-9999.ebuild
index 941834eadacc..fb932a115bc9 100644
--- a/dev-ros/rosmsg/rosmsg-9999.ebuild
+++ b/dev-ros/rosmsg/rosmsg-9999.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/rosnode/Manifest b/dev-ros/rosnode/Manifest
index 5e061965ca39..6e48a5065d88 100644
--- a/dev-ros/rosnode/Manifest
+++ b/dev-ros/rosnode/Manifest
@@ -1,20 +1,4 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosnode-1.13.0.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-1.13.1.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-1.13.2.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-1.13.4.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-1.13.5.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-1.13.6.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-1.14.2.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-1.14.3.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-1.15.4.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-9999.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD rosnode-1.15.7.ebuild 522 BLAKE2B d1379dd92f1c2476936c4012e4dbc235ad38c8493acb28e5bfaf37f7cafbeaaeb0b2cf9a8bb44f86a7a77fe1378238367dd43fea991d3b31f099b820a6541b0d SHA512 b87c226db319c85129971fff4fc54b4bda116af36d60114a2963b2e7e81298f831ed4887fcac105975e6f9654ad3eaa0dd592914f953083985ba348558d57f8d
+EBUILD rosnode-9999.ebuild 522 BLAKE2B d1379dd92f1c2476936c4012e4dbc235ad38c8493acb28e5bfaf37f7cafbeaaeb0b2cf9a8bb44f86a7a77fe1378238367dd43fea991d3b31f099b820a6541b0d SHA512 b87c226db319c85129971fff4fc54b4bda116af36d60114a2963b2e7e81298f831ed4887fcac105975e6f9654ad3eaa0dd592914f953083985ba348558d57f8d
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosnode/rosnode-1.13.0.ebuild b/dev-ros/rosnode/rosnode-1.13.0.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.13.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.13.1.ebuild b/dev-ros/rosnode/rosnode-1.13.1.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.13.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.13.2.ebuild b/dev-ros/rosnode/rosnode-1.13.2.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.13.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.13.4.ebuild b/dev-ros/rosnode/rosnode-1.13.4.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.13.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.13.5.ebuild b/dev-ros/rosnode/rosnode-1.13.5.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.13.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.13.6.ebuild b/dev-ros/rosnode/rosnode-1.13.6.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.13.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.14.2.ebuild b/dev-ros/rosnode/rosnode-1.14.2.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.14.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.14.3.ebuild b/dev-ros/rosnode/rosnode-1.14.3.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.14.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.15.4.ebuild b/dev-ros/rosnode/rosnode-1.15.4.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.15.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.15.7.ebuild b/dev-ros/rosnode/rosnode-1.15.7.ebuild
new file mode 100644
index 000000000000..ef8125d8b17e
--- /dev/null
+++ b/dev-ros/rosnode/rosnode-1.15.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/genmsg[${PYTHON_USEDEP}]
+ dev-python/rospkg[${PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-9999.ebuild b/dev-ros/rosnode/rosnode-9999.ebuild
index 032e59ae3c1e..ef8125d8b17e 100644
--- a/dev-ros/rosnode/rosnode-9999.ebuild
+++ b/dev-ros/rosnode/rosnode-9999.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/rosout/Manifest b/dev-ros/rosout/Manifest
index 720f18934063..790bfd6176ba 100644
--- a/dev-ros/rosout/Manifest
+++ b/dev-ros/rosout/Manifest
@@ -1,20 +1,4 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosout-1.13.0.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
-EBUILD rosout-1.13.1.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
-EBUILD rosout-1.13.2.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
-EBUILD rosout-1.13.4.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
-EBUILD rosout-1.13.5.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
-EBUILD rosout-1.13.6.ebuild 447 BLAKE2B 81c9dd524245527cee90454c213d934a2a45b9da4ad4f99951b2ffa1e378ba29c1fd95cabb9e1b6ee06fe40bc92cc6a9b80b29a657364c6ad46ceb00d69b8117 SHA512 93c1d6a9774efc847bd8263218db6e932b9afcfb0f34f5836cb54fb0374777606917462fa198ba025a47268238ed95408a4e08233b602d3f21d4169b7a7cd56f
-EBUILD rosout-1.14.2.ebuild 447 BLAKE2B 81c9dd524245527cee90454c213d934a2a45b9da4ad4f99951b2ffa1e378ba29c1fd95cabb9e1b6ee06fe40bc92cc6a9b80b29a657364c6ad46ceb00d69b8117 SHA512 93c1d6a9774efc847bd8263218db6e932b9afcfb0f34f5836cb54fb0374777606917462fa198ba025a47268238ed95408a4e08233b602d3f21d4169b7a7cd56f
-EBUILD rosout-1.14.3.ebuild 447 BLAKE2B 81c9dd524245527cee90454c213d934a2a45b9da4ad4f99951b2ffa1e378ba29c1fd95cabb9e1b6ee06fe40bc92cc6a9b80b29a657364c6ad46ceb00d69b8117 SHA512 93c1d6a9774efc847bd8263218db6e932b9afcfb0f34f5836cb54fb0374777606917462fa198ba025a47268238ed95408a4e08233b602d3f21d4169b7a7cd56f
-EBUILD rosout-1.15.4.ebuild 444 BLAKE2B eef3bc8ba0a343f04a15b9c406cf75e49da247ffa471e43e84ebc82735039f6c8e9f37154c024c637d14404cabcbaf0bfb00e02384c92141da9ce83794917526 SHA512 d70e2077c1f64dc89dd751fc7c5c23d04069b77d06a91a64812afd8a0c7be5fb901d075fbb109246ad92a28de0492ddec054259b2a8fb10777ad5b6f3271cfa6
-EBUILD rosout-9999.ebuild 447 BLAKE2B adabe1d2c1ee22ac5c5a0a779b6aaf8727ef695af867b2c8b0c91d9d68f4fcefe12641d6952981925090335b78df5c35fc8f91d022e6e6abaaacea5539a59f6a SHA512 803a69ff8f9f0ee9dfd2c1d071307f185fead002952113c31c216583f3d77688bf86205e76d79326c72d2472e533d685304247178debda9607fa2d3547433a6b
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD rosout-1.15.7.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
+EBUILD rosout-9999.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosout/rosout-1.13.0.ebuild b/dev-ros/rosout/rosout-1.13.0.ebuild
deleted file mode 100644
index 956032ae87e7..000000000000
--- a/dev-ros/rosout/rosout-1.13.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.13.1.ebuild b/dev-ros/rosout/rosout-1.13.1.ebuild
deleted file mode 100644
index 956032ae87e7..000000000000
--- a/dev-ros/rosout/rosout-1.13.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.13.2.ebuild b/dev-ros/rosout/rosout-1.13.2.ebuild
deleted file mode 100644
index 956032ae87e7..000000000000
--- a/dev-ros/rosout/rosout-1.13.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.13.4.ebuild b/dev-ros/rosout/rosout-1.13.4.ebuild
deleted file mode 100644
index 956032ae87e7..000000000000
--- a/dev-ros/rosout/rosout-1.13.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.13.5.ebuild b/dev-ros/rosout/rosout-1.13.5.ebuild
deleted file mode 100644
index 956032ae87e7..000000000000
--- a/dev-ros/rosout/rosout-1.13.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.13.6.ebuild b/dev-ros/rosout/rosout-1.13.6.ebuild
deleted file mode 100644
index 73aa43ce3f38..000000000000
--- a/dev-ros/rosout/rosout-1.13.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.14.2.ebuild b/dev-ros/rosout/rosout-1.14.2.ebuild
deleted file mode 100644
index 73aa43ce3f38..000000000000
--- a/dev-ros/rosout/rosout-1.14.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.14.3.ebuild b/dev-ros/rosout/rosout-1.14.3.ebuild
deleted file mode 100644
index 73aa43ce3f38..000000000000
--- a/dev-ros/rosout/rosout-1.14.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.15.4.ebuild b/dev-ros/rosout/rosout-1.15.4.ebuild
deleted file mode 100644
index 0315427da820..000000000000
--- a/dev-ros/rosout/rosout-1.15.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.15.7.ebuild b/dev-ros/rosout/rosout-1.15.7.ebuild
new file mode 100644
index 000000000000..4a60a4d6a5fe
--- /dev/null
+++ b/dev-ros/rosout/rosout-1.15.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+"
+DEPEND="${RDEPEND}
+ dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/rosout/rosout-9999.ebuild b/dev-ros/rosout/rosout-9999.ebuild
index d76a1b4bd999..4a60a4d6a5fe 100644
--- a/dev-ros/rosout/rosout-9999.ebuild
+++ b/dev-ros/rosout/rosout-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
@@ -16,6 +16,7 @@ IUSE=""
RDEPEND="
dev-ros/roscpp
+"
+DEPEND="${RDEPEND}
dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/Manifest b/dev-ros/rosparam/Manifest
index a2105d3d7329..6d7096752329 100644
--- a/dev-ros/rosparam/Manifest
+++ b/dev-ros/rosparam/Manifest
@@ -1,8 +1,4 @@
-AUX yaml.patch 895 BLAKE2B 983493cadf83e5eee7646769ddc8560bbcff3756ebdb77f4365e0a3e10d97b104c4a6ec3ceb0d7e3504502c250cc21ee07b3f5582e3521a5eafe7f5925c622a1 SHA512 92a6ba5660b2cc0a490477d4e4fd39ebbd95912804d5c32c76eec5dc4fc5a67e043dc9cce2ee13d44c623b7a7b710d045fabd68ff3968d2e5ea555d97eb219f2
-AUX yaml2.patch 3279 BLAKE2B 8ca2d9dcd99eeefe7ca2c5039a894bfcda02586995a2982c8f6ea6ac61c19c16325e53bd0733b1c3272160f3dd572ed8aa5c754ad7d182adfc8e85f7b39e0c99 SHA512 23856b931f203fc3c0adfddbcc3c94ea1b827eb2a1f8550d130ac25abdb09a2167da5f4ae9aaf9d869326a80f1964e0f5a00e68895133fb101e4accdf6f5a4c4
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosparam-1.14.3-r1.ebuild 562 BLAKE2B 77a1ff5ef7d1035009421bd5582e5bea52ea11e5fdbb45349ef37a4c46449aac66333e16b89158e367ee2e379cd94c3a8dd11f23339a498c2d10ec8cd3b6cebf SHA512 d3056a70cbf9903d22f9d5d76b243d6f98aa50563a9be7248972dbd1cbca4570e922a304af8555be8c47254732f2a2aa7973c5fffa27b5a5a4118fddb721325a
-EBUILD rosparam-1.15.4.ebuild 499 BLAKE2B 44b8e57ab8d44f3f014c3a04520698fd27495d948c7423720a9d3b4f92f227bc782319d90f20a87b3389381127f6f405630c6138e62e5c0e8745ce3e9072ebaf SHA512 902d85db77f75bc112fb01ff608994c4c98fbd6b862a0f195a88956a0319752cacbf0ec314a41af8f2f5e9ec9b2da842a674154db60012c624d8dc91b3428546
-EBUILD rosparam-9999.ebuild 499 BLAKE2B 44b8e57ab8d44f3f014c3a04520698fd27495d948c7423720a9d3b4f92f227bc782319d90f20a87b3389381127f6f405630c6138e62e5c0e8745ce3e9072ebaf SHA512 902d85db77f75bc112fb01ff608994c4c98fbd6b862a0f195a88956a0319752cacbf0ec314a41af8f2f5e9ec9b2da842a674154db60012c624d8dc91b3428546
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD rosparam-1.15.7.ebuild 459 BLAKE2B 2646640238c7ca69fe772e6e101383dfc0ba1c7376b62722250919a2e0d27344be5693ca2c3cb18a2c226ad80da5db04e1d0dfb5dff7c4d6809bf7d65e926817 SHA512 e50dce738b2d48a02341614c7c888c7e15cfa4b6ed777e58a94c534a70045fea916d27fcdee9406894e6814593861a6e383acf690ba5cf4fc7fc935b18e5ab97
+EBUILD rosparam-9999.ebuild 459 BLAKE2B 2646640238c7ca69fe772e6e101383dfc0ba1c7376b62722250919a2e0d27344be5693ca2c3cb18a2c226ad80da5db04e1d0dfb5dff7c4d6809bf7d65e926817 SHA512 e50dce738b2d48a02341614c7c888c7e15cfa4b6ed777e58a94c534a70045fea916d27fcdee9406894e6814593861a6e383acf690ba5cf4fc7fc935b18e5ab97
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosparam/files/yaml.patch b/dev-ros/rosparam/files/yaml.patch
deleted file mode 100644
index a4ed42758f13..000000000000
--- a/dev-ros/rosparam/files/yaml.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 481ad19689561052afde658ab0c54c91b0e5e04a Mon Sep 17 00:00:00 2001
-From: Maxime St-Pierre
-Date: Sun, 10 Nov 2019 06:27:40 -0500
-Subject: [PATCH] Fix #1833 change unsafe yaml.load to yaml.safe_load
-
----
- tools/rosparam/src/rosparam/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/rosparam/src/rosparam/__init__.py b/tools/rosparam/src/rosparam/__init__.py
-index 3279ab97d..fd8b0569f 100644
---- a/tools/rosparam/src/rosparam/__init__.py
-+++ b/tools/rosparam/src/rosparam/__init__.py
-@@ -368,7 +368,7 @@ def set_param(param, value, verbose=False):
- :param param: parameter name, ``str``
- :param value: yaml-encoded value, ``str``
- """
-- set_param_raw(param, yaml.load(value), verbose=verbose)
-+ set_param_raw(param, yaml.safe_load(value), verbose=verbose)
-
- def upload_params(ns, values, verbose=False):
- """
diff --git a/dev-ros/rosparam/files/yaml2.patch b/dev-ros/rosparam/files/yaml2.patch
deleted file mode 100644
index 1e36844ee38c..000000000000
--- a/dev-ros/rosparam/files/yaml2.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py | 2 +-
- .../test/test_roslib_message.py | 2 +-
- .../client_verification/test_slave_api.py | 2 +-
- test/test_rosparam/test/check_rosparam.py | 8 ++---
- .../check_rosparam_command_line_online.py | 2 +-
- .../check_rosservice_command_line_online.py | 4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py | 2 +-
- tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
- tools/roslaunch/src/roslaunch/loader.py | 4 +--
- .../test/unit/test_roslaunch_dump_params.py | 4 +--
- tools/rosparam/src/rosparam/__init__.py | 7 ++++-
- tools/rosservice/src/rosservice/__init__.py | 4 +--
- tools/rostopic/src/rostopic/__init__.py | 6 ++--
- tools/topic_tools/scripts/relay_field | 2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/tools/rosparam/src/rosparam/__init__.py b/tools/rosparam/src/rosparam/__init__.py
-index 41b806711..3279ab97d 100644
---- a/tools/rosparam/src/rosparam/__init__.py
-+++ b/tools/rosparam/src/rosparam/__init__.py
-@@ -99,6 +99,7 @@ def construct_yaml_binary(loader, node):
- # register the (de)serializers with pyyaml
- yaml.add_representer(Binary,represent_xml_binary)
- yaml.add_constructor(u'tag:yaml.org,2002:binary', construct_yaml_binary)
-+yaml.SafeLoader.add_constructor(u'tag:yaml.org,2002:binary', construct_yaml_binary)
-
- def construct_angle_radians(loader, node):
- """
-@@ -185,7 +186,7 @@ def load_str(str, filename, default_namespace=None, verbose=False):
- """
- paramlist = []
- default_namespace = default_namespace or get_ros_namespace()
-- for doc in yaml.load_all(str):
-+ for doc in yaml.safe_load_all(str):
- if NS in doc:
- ns = ns_join(default_namespace, doc.get(NS, None))
- if verbose:
-@@ -633,10 +634,14 @@ def yamlmain(argv=None):
-
- yaml.add_constructor(u'!radians', construct_angle_radians)
- yaml.add_constructor(u'!degrees', construct_angle_degrees)
-+yaml.SafeLoader.add_constructor(u'!radians', construct_angle_radians)
-+yaml.SafeLoader.add_constructor(u'!degrees', construct_angle_degrees)
-
- # allow both !degrees 180, !radians 2*pi
- pattern = re.compile(r'^deg\([^\)]*\)$')
- yaml.add_implicit_resolver(u'!degrees', pattern, first="deg(")
-+yaml.SafeLoader.add_implicit_resolver(u'!degrees', pattern, first="deg(")
- pattern = re.compile(r'^rad\([^\)]*\)$')
- yaml.add_implicit_resolver(u'!radians', pattern, first="rad(")
-+yaml.SafeLoader.add_implicit_resolver(u'!radians', pattern, first="rad(")
-
diff --git a/dev-ros/rosparam/rosparam-1.14.3-r1.ebuild b/dev-ros/rosparam/rosparam-1.14.3-r1.ebuild
deleted file mode 100644
index f0fe1a56c7cf..000000000000
--- a/dev-ros/rosparam/rosparam-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/yaml2.patch" )
diff --git a/dev-ros/rosparam/rosparam-1.15.4.ebuild b/dev-ros/rosparam/rosparam-1.15.4.ebuild
deleted file mode 100644
index 07a0e27680c2..000000000000
--- a/dev-ros/rosparam/rosparam-1.15.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.15.7.ebuild b/dev-ros/rosparam/rosparam-1.15.7.ebuild
new file mode 100644
index 000000000000..0e24595a413f
--- /dev/null
+++ b/dev-ros/rosparam/rosparam-1.15.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-9999.ebuild b/dev-ros/rosparam/rosparam-9999.ebuild
index 07a0e27680c2..0e24595a413f 100644
--- a/dev-ros/rosparam/rosparam-9999.ebuild
+++ b/dev-ros/rosparam/rosparam-9999.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
inherit ros-catkin
diff --git a/dev-ros/rospy/Manifest b/dev-ros/rospy/Manifest
index f2523aa6960e..a201e76f0ce4 100644
--- a/dev-ros/rospy/Manifest
+++ b/dev-ros/rospy/Manifest
@@ -1,7 +1,4 @@
-AUX yaml.patch 2320 BLAKE2B 2b59ccbd08c333df5b6ec603136ac94202da82eec17f13b4b84c1df66636d2fadf22eaacb5d24e7d00543358eb1f539ffa7c09498ed0afeda5ae5e382b17660f SHA512 de3f2c418f5d84f99af771634cca03e5982ca0a828f404fdfe62de2e8fac9cf4dcaf681e1892f37908568fd5b70f527c0f4f860e201ba330dda65b1e7098de30
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rospy-1.14.3-r1.ebuild 757 BLAKE2B e6a4dddf0d7316388b6c5de241c94be85680c212508f0301b13d140e51c007ace25e94f429d7c037e836f6da98986386b1b945c663ba18cda1cb4bd9e1bccea6 SHA512 00efa18957a3fb4f556c41a998e060888e1d5cb299e3a197c6a2a669c4996892e18ab9c92a4b93623d0b30ab8525108c1b8855b56bc797bba5e00f5f45d2e1a3
-EBUILD rospy-1.15.4.ebuild 720 BLAKE2B 718df093cd4d0c42aff4a245a6cc6f070aba7100e45f978fd3257b711b81e857547ee05665c48f7c9f36a813c6eb12fa26d594a9776ed3ddbdd7cfc7bfd3b342 SHA512 83e83ccd7a5a61df417dbc81f0a8691fc5265f76cb301329cad5d4fd35bc428cf7500479934081d69fed3e285ff28945c5f69943c2e7585e0d3ec343d58b9a42
-EBUILD rospy-9999.ebuild 720 BLAKE2B 718df093cd4d0c42aff4a245a6cc6f070aba7100e45f978fd3257b711b81e857547ee05665c48f7c9f36a813c6eb12fa26d594a9776ed3ddbdd7cfc7bfd3b342 SHA512 83e83ccd7a5a61df417dbc81f0a8691fc5265f76cb301329cad5d4fd35bc428cf7500479934081d69fed3e285ff28945c5f69943c2e7585e0d3ec343d58b9a42
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD rospy-1.15.7.ebuild 680 BLAKE2B c54e3699eb0046c670047c819910762102167f90b03060786c119b19419663f81a5190903066ca01361737298a3658f94866d7d1e2427aca74a0087c40d73df9 SHA512 1cbb22cee93127e8d62c8cbaee2db2f5916ef7b9adb51ac4c2a145795f50cfd5aed25167d059ab5d60aa152784994cbac9e4faa899d2509800204aa56cf6c3e5
+EBUILD rospy-9999.ebuild 680 BLAKE2B c54e3699eb0046c670047c819910762102167f90b03060786c119b19419663f81a5190903066ca01361737298a3658f94866d7d1e2427aca74a0087c40d73df9 SHA512 1cbb22cee93127e8d62c8cbaee2db2f5916ef7b9adb51ac4c2a145795f50cfd5aed25167d059ab5d60aa152784994cbac9e4faa899d2509800204aa56cf6c3e5
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rospy/files/yaml.patch b/dev-ros/rospy/files/yaml.patch
deleted file mode 100644
index e9e9aa8202a9..000000000000
--- a/dev-ros/rospy/files/yaml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py | 2 +-
- .../test/test_roslib_message.py | 2 +-
- .../client_verification/test_slave_api.py | 2 +-
- test/test_rosparam/test/check_rosparam.py | 8 ++---
- .../check_rosparam_command_line_online.py | 2 +-
- .../check_rosservice_command_line_online.py | 4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py | 2 +-
- tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
- tools/roslaunch/src/roslaunch/loader.py | 4 +--
- .../test/unit/test_roslaunch_dump_params.py | 4 +--
- tools/rosparam/src/rosparam/__init__.py | 7 ++++-
- tools/rosservice/src/rosservice/__init__.py | 4 +--
- tools/rostopic/src/rostopic/__init__.py | 6 ++--
- tools/topic_tools/scripts/relay_field | 2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/clients/rospy/src/rospy/client.py b/clients/rospy/src/rospy/client.py
-index d543c53ac..c72d6d6f0 100644
---- a/clients/rospy/src/rospy/client.py
-+++ b/clients/rospy/src/rospy/client.py
-@@ -101,7 +101,7 @@ def load_command_line_node_params(argv):
- src, dst = [x.strip() for x in arg.split(rosgraph.names.REMAP)]
- if src and dst:
- if len(src) > 1 and src[0] == '_' and src[1] != '_':
-- mappings[src[1:]] = yaml.load(dst)
-+ mappings[src[1:]] = yaml.safe_load(dst)
- return mappings
- except Exception as e:
- raise rospy.exceptions.ROSInitException("invalid command-line parameters: %s"%(str(e)))
diff --git a/dev-ros/rospy/rospy-1.14.3-r1.ebuild b/dev-ros/rospy/rospy-1.14.3-r1.ebuild
deleted file mode 100644
index 72153d4c7f54..000000000000
--- a/dev-ros/rospy/rospy-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roscpp[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/yaml.patch" )
-
-src_install() {
- ros-catkin_src_install
- # Other tests need these nodes
- exeinto /usr/share/${PN}
- doexe test_nodes/*
-}
diff --git a/dev-ros/rospy/rospy-1.15.4.ebuild b/dev-ros/rospy/rospy-1.15.4.ebuild
deleted file mode 100644
index ed13430b1e69..000000000000
--- a/dev-ros/rospy/rospy-1.15.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roscpp[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
- ros-catkin_src_install
- # Other tests need these nodes
- exeinto /usr/share/${PN}
- doexe test_nodes/*
-}
diff --git a/dev-ros/rospy/rospy-1.15.7.ebuild b/dev-ros/rospy/rospy-1.15.7.ebuild
new file mode 100644
index 000000000000..e6a77b3c3c0e
--- /dev/null
+++ b/dev-ros/rospy/rospy-1.15.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python client library for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-python/rospkg[${PYTHON_USEDEP}]
+ dev-ros/roscpp[${PYTHON_USEDEP}]
+ dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ ros-catkin_src_install
+ # Other tests need these nodes
+ exeinto /usr/share/${PN}
+ doexe test_nodes/*
+}
diff --git a/dev-ros/rospy/rospy-9999.ebuild b/dev-ros/rospy/rospy-9999.ebuild
index ed13430b1e69..e6a77b3c3c0e 100644
--- a/dev-ros/rospy/rospy-9999.ebuild
+++ b/dev-ros/rospy/rospy-9999.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
ROS_SUBDIR=clients/${PN}
inherit ros-catkin
diff --git a/dev-ros/rosservice/Manifest b/dev-ros/rosservice/Manifest
index b130b6f43f44..fe97965562a4 100644
--- a/dev-ros/rosservice/Manifest
+++ b/dev-ros/rosservice/Manifest
@@ -1,7 +1,4 @@
-AUX yaml.patch 2657 BLAKE2B 16f9cc5cafd8306d06f64370bf334f68038e3b2e7feb6d48110cdddb12e00fb27b8f36492bd6ddca8eb0902da727d371266b3cd65440c82c3b9785c9823e1ad3 SHA512 3b71ccb1b3579bb16c86a0dbbc0708e7417461a91b31d1ab166ed38a3e75f117df355d91d9c1644d9c5da19c29b61ea208e6eed31ae6dfdd74bc6f057b0c1908
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosservice-1.14.3-r1.ebuild 563 BLAKE2B c8aeda6239e07fa3b92638fe357f7d743b3cd68215ad21296077d904e88dec993059379c69afe878c3a7e3dd9e19729ff577fe93d0117388d1ebc6c0667d5b12 SHA512 873d3e1062c0d25a6931a090ad87f3c64882666b296a39e6700973d558e7949bf4199e35b75df7909f86ebc1bb38cd147bcd211c748e3ace4caad7e13c10a4e6
-EBUILD rosservice-1.15.4.ebuild 526 BLAKE2B 65c0eee5316816509b9d0b5819d52264d8c3242d133b58b4bdd9ccd33b44e2578105e011346398d21673012b1aff05f19ca0f3108f76aa482eed50971d5c5c05 SHA512 d2ec7a759dbeda80e1fe3abae6c8f17cfb7f9f86c63540d449678264d12c30edfb367faf35ff3b2ad5e444c4bff074855f3501e1da7961e077f133b138e3afde
-EBUILD rosservice-9999.ebuild 526 BLAKE2B 65c0eee5316816509b9d0b5819d52264d8c3242d133b58b4bdd9ccd33b44e2578105e011346398d21673012b1aff05f19ca0f3108f76aa482eed50971d5c5c05 SHA512 d2ec7a759dbeda80e1fe3abae6c8f17cfb7f9f86c63540d449678264d12c30edfb367faf35ff3b2ad5e444c4bff074855f3501e1da7961e077f133b138e3afde
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD rosservice-1.15.7.ebuild 498 BLAKE2B 0fe4fea757991895fa02037d4c4cc257f60eefc601b07b120bd1e6a97b0e18eb1df97f5156a1d727093479cbe190393976514fc26cb31a0adf501a21e9040d34 SHA512 759ed520f35e8da1961c2ca99d42f2f1b36348e18797405a39073c15b5c6a37d8285ab0020f3c86db58bd783f0bc1dc8304e718c7033e1e80fdf75dabedfb9a3
+EBUILD rosservice-9999.ebuild 498 BLAKE2B 0fe4fea757991895fa02037d4c4cc257f60eefc601b07b120bd1e6a97b0e18eb1df97f5156a1d727093479cbe190393976514fc26cb31a0adf501a21e9040d34 SHA512 759ed520f35e8da1961c2ca99d42f2f1b36348e18797405a39073c15b5c6a37d8285ab0020f3c86db58bd783f0bc1dc8304e718c7033e1e80fdf75dabedfb9a3
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosservice/files/yaml.patch b/dev-ros/rosservice/files/yaml.patch
deleted file mode 100644
index f5dfcd3553fe..000000000000
--- a/dev-ros/rosservice/files/yaml.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py | 2 +-
- .../test/test_roslib_message.py | 2 +-
- .../client_verification/test_slave_api.py | 2 +-
- test/test_rosparam/test/check_rosparam.py | 8 ++---
- .../check_rosparam_command_line_online.py | 2 +-
- .../check_rosservice_command_line_online.py | 4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py | 2 +-
- tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
- tools/roslaunch/src/roslaunch/loader.py | 4 +--
- .../test/unit/test_roslaunch_dump_params.py | 4 +--
- tools/rosparam/src/rosparam/__init__.py | 7 ++++-
- tools/rosservice/src/rosservice/__init__.py | 4 +--
- tools/rostopic/src/rostopic/__init__.py | 6 ++--
- tools/topic_tools/scripts/relay_field | 2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/tools/rosservice/src/rosservice/__init__.py b/tools/rosservice/src/rosservice/__init__.py
-index 6d58807a4..e6c41a73d 100644
---- a/tools/rosservice/src/rosservice/__init__.py
-+++ b/tools/rosservice/src/rosservice/__init__.py
-@@ -607,7 +607,7 @@ def _rosservice_cmd_call(argv):
- # convert empty args to YAML-empty strings
- if arg == '':
- arg = "''"
-- service_args.append(yaml.load(arg))
-+ service_args.append(yaml.safe_load(arg))
- if not service_args and has_service_args(service_name, service_class=service_class):
- if sys.stdin.isatty():
- parser.error("Please specify service arguments")
-@@ -650,7 +650,7 @@ def _stdin_yaml_arg():
- elif arg.strip() != '---':
- buff = buff + arg
- try:
-- loaded = yaml.load(buff.rstrip())
-+ loaded = yaml.safe_load(buff.rstrip())
- except Exception as e:
- print("Invalid YAML: %s"%str(e), file=sys.stderr)
- if loaded is not None:
diff --git a/dev-ros/rosservice/rosservice-1.14.3-r1.ebuild b/dev-ros/rosservice/rosservice-1.14.3-r1.ebuild
deleted file mode 100644
index 3183e24923b0..000000000000
--- a/dev-ros/rosservice/rosservice-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/rosservice/rosservice-1.15.4.ebuild b/dev-ros/rosservice/rosservice-1.15.4.ebuild
deleted file mode 100644
index dec58f5c3cba..000000000000
--- a/dev-ros/rosservice/rosservice-1.15.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.15.7.ebuild b/dev-ros/rosservice/rosservice-1.15.7.ebuild
new file mode 100644
index 000000000000..051158a69289
--- /dev/null
+++ b/dev-ros/rosservice/rosservice-1.15.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for listing and querying ROS Services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosmsg[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-9999.ebuild b/dev-ros/rosservice/rosservice-9999.ebuild
index dec58f5c3cba..051158a69289 100644
--- a/dev-ros/rosservice/rosservice-9999.ebuild
+++ b/dev-ros/rosservice/rosservice-9999.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/rostest/Manifest b/dev-ros/rostest/Manifest
index d16d3b165781..d4d83dcf53c0 100644
--- a/dev-ros/rostest/Manifest
+++ b/dev-ros/rostest/Manifest
@@ -1,20 +1,4 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rostest-1.13.0.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
-EBUILD rostest-1.13.1.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
-EBUILD rostest-1.13.2.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
-EBUILD rostest-1.13.4.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
-EBUILD rostest-1.13.5.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
-EBUILD rostest-1.13.6.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
-EBUILD rostest-1.14.2.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
-EBUILD rostest-1.14.3.ebuild 731 BLAKE2B c4be2ea8b698906763e8a70df769b1f62b6ee019dd145e152bdcd9af8b519a0294db9763250367c7cd13409dd8181722e3088646445968cd8815df30e6cffc3d SHA512 cfffbdb069d719009e5204c74bb37b34a0c4f3d774d6671252951044128c3d8969ab6034cdd528784c6c5b6a6580cb1c7b4d6f5bc2ff977203f7f34827cc98ef
-EBUILD rostest-1.15.4.ebuild 731 BLAKE2B c4be2ea8b698906763e8a70df769b1f62b6ee019dd145e152bdcd9af8b519a0294db9763250367c7cd13409dd8181722e3088646445968cd8815df30e6cffc3d SHA512 cfffbdb069d719009e5204c74bb37b34a0c4f3d774d6671252951044128c3d8969ab6034cdd528784c6c5b6a6580cb1c7b4d6f5bc2ff977203f7f34827cc98ef
-EBUILD rostest-9999.ebuild 731 BLAKE2B c4be2ea8b698906763e8a70df769b1f62b6ee019dd145e152bdcd9af8b519a0294db9763250367c7cd13409dd8181722e3088646445968cd8815df30e6cffc3d SHA512 cfffbdb069d719009e5204c74bb37b34a0c4f3d774d6671252951044128c3d8969ab6034cdd528784c6c5b6a6580cb1c7b4d6f5bc2ff977203f7f34827cc98ef
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD rostest-1.15.7.ebuild 683 BLAKE2B ef0358da0d70a876eb717e5b294679eab454ad3ef3177555265771f08d3d954577b5fb52f4ba9b1c7199cde85d95d97c7cf1f465be6305d6bc132bb2cc0298f0 SHA512 4a7ddaf384e75fad7d13b480769af8bd86e97061df564b1fbf5bd3121bf614579e925dcfb7bf9ef0797849eed46d5146e4b3d7f5f3985b8e76ade16673ac4213
+EBUILD rostest-9999.ebuild 683 BLAKE2B ef0358da0d70a876eb717e5b294679eab454ad3ef3177555265771f08d3d954577b5fb52f4ba9b1c7199cde85d95d97c7cf1f465be6305d6bc132bb2cc0298f0 SHA512 4a7ddaf384e75fad7d13b480769af8bd86e97061df564b1fbf5bd3121bf614579e925dcfb7bf9ef0797849eed46d5146e4b3d7f5f3985b8e76ade16673ac4213
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rostest/rostest-1.13.0.ebuild b/dev-ros/rostest/rostest-1.13.0.ebuild
deleted file mode 100644
index 1108cd80dccd..000000000000
--- a/dev-ros/rostest/rostest-1.13.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
- test? (
- ${RDEPEND}
- dev-cpp/gtest
- )"
diff --git a/dev-ros/rostest/rostest-1.13.1.ebuild b/dev-ros/rostest/rostest-1.13.1.ebuild
deleted file mode 100644
index 1108cd80dccd..000000000000
--- a/dev-ros/rostest/rostest-1.13.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
- test? (
- ${RDEPEND}
- dev-cpp/gtest
- )"
diff --git a/dev-ros/rostest/rostest-1.13.2.ebuild b/dev-ros/rostest/rostest-1.13.2.ebuild
deleted file mode 100644
index 1108cd80dccd..000000000000
--- a/dev-ros/rostest/rostest-1.13.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
- test? (
- ${RDEPEND}
- dev-cpp/gtest
- )"
diff --git a/dev-ros/rostest/rostest-1.13.4.ebuild b/dev-ros/rostest/rostest-1.13.4.ebuild
deleted file mode 100644
index 1108cd80dccd..000000000000
--- a/dev-ros/rostest/rostest-1.13.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
- test? (
- ${RDEPEND}
- dev-cpp/gtest
- )"
diff --git a/dev-ros/rostest/rostest-1.13.5.ebuild b/dev-ros/rostest/rostest-1.13.5.ebuild
deleted file mode 100644
index 1108cd80dccd..000000000000
--- a/dev-ros/rostest/rostest-1.13.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
- test? (
- ${RDEPEND}
- dev-cpp/gtest
- )"
diff --git a/dev-ros/rostest/rostest-1.13.6.ebuild b/dev-ros/rostest/rostest-1.13.6.ebuild
deleted file mode 100644
index 1108cd80dccd..000000000000
--- a/dev-ros/rostest/rostest-1.13.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
- test? (
- ${RDEPEND}
- dev-cpp/gtest
- )"
diff --git a/dev-ros/rostest/rostest-1.14.2.ebuild b/dev-ros/rostest/rostest-1.14.2.ebuild
deleted file mode 100644
index 1108cd80dccd..000000000000
--- a/dev-ros/rostest/rostest-1.14.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
- test? (
- ${RDEPEND}
- dev-cpp/gtest
- )"
diff --git a/dev-ros/rostest/rostest-1.14.3.ebuild b/dev-ros/rostest/rostest-1.14.3.ebuild
deleted file mode 100644
index c8b1067e86a3..000000000000
--- a/dev-ros/rostest/rostest-1.14.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
- test? (
- ${RDEPEND}
- dev-cpp/gtest
- dev-ros/rostopic
- )"
diff --git a/dev-ros/rostest/rostest-1.15.4.ebuild b/dev-ros/rostest/rostest-1.15.4.ebuild
deleted file mode 100644
index c8b1067e86a3..000000000000
--- a/dev-ros/rostest/rostest-1.15.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
- test? (
- ${RDEPEND}
- dev-cpp/gtest
- dev-ros/rostopic
- )"
diff --git a/dev-ros/rostest/rostest-1.15.7.ebuild b/dev-ros/rostest/rostest-1.15.7.ebuild
new file mode 100644
index 000000000000..8b6226d4ffee
--- /dev/null
+++ b/dev-ros/rostest/rostest-1.15.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Integration test suite based on roslaunch compatible with xUnit frameworks"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosunit[${PYTHON_USEDEP}]
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/roslaunch[${PYTHON_USEDEP}]
+ dev-ros/rosmaster[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+ test? (
+ ${RDEPEND}
+ dev-cpp/gtest
+ dev-ros/rostopic
+ )"
diff --git a/dev-ros/rostest/rostest-9999.ebuild b/dev-ros/rostest/rostest-9999.ebuild
index c8b1067e86a3..8b6226d4ffee 100644
--- a/dev-ros/rostest/rostest-9999.ebuild
+++ b/dev-ros/rostest/rostest-9999.ebuild
@@ -1,16 +1,15 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
inherit ros-catkin
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
+DESCRIPTION="Integration test suite based on roslaunch compatible with xUnit frameworks"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/rostopic/Manifest b/dev-ros/rostopic/Manifest
index b344d8045857..b3495e20665d 100644
--- a/dev-ros/rostopic/Manifest
+++ b/dev-ros/rostopic/Manifest
@@ -1,8 +1,4 @@
-AUX py3.patch 4958 BLAKE2B c441bee4b3ae1095b32aecb9618120d41d2cda53062ba4ce7c85f539840be27ed035a4f3da87f643217a650c1766b6b9c94f48d44116a753ddc6ab44a5a0fd43 SHA512 b576a41c69680df1a388b30b3588ef0a94609b6338820a08deaa2ed3f29b05816bbb68db256cb843ae394f12723674a485e1b933caa2a19729a3c610de5c8345
-AUX yaml.patch 2816 BLAKE2B ecd4c4047f009dcc9c2417efa8a2233220dc002ede217beee75f88af111b1bab26423aba8796027f60e73887c0926e5099fa9db114b8a7f5144e25a5acf04789 SHA512 f3d197fec12c9df46eb488398c3149c36f0b7581a2a2c7ae7052bc0c37ed27302405b1aba81a140463ffe52fd8a9f65789371bbb697e0d09867b0ca02ce35340
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rostopic-1.14.3-r1.ebuild 614 BLAKE2B 53a0cbbe88bf306c7c348c50a16d61c612002c33174c9c1f84fb1d8b066d9bff950a7813d22c8b4cf5261d4dbedce2e60aec443798fccf9755173c9a61b1acc7 SHA512 7367cd95c60c2c8a6c0a97a0c4b31bf1acc357e0036f7a63cb714d8dd6e15140fd89a7ad777cb7aa2e5c93ab03854b2eabd4ff4ecae16708dc0db182f034e1d6
-EBUILD rostopic-1.15.4.ebuild 553 BLAKE2B 0b9508bdf9327727eba2d3e44eb3b14d06d610d915f2199c524cb1e7b40497e0844ce8bfad318bb9052f46c19662dd8db8d67739450a49ce3b5ffac5bb6e4208 SHA512 793194ac2652d09b512cd95cbc2a4531418b11f1d9b119b8bf164af27b90db18938b8cc64a41944afe39fc115baf85c2fb161e60e458605498d0c23ca15c62b3
-EBUILD rostopic-9999.ebuild 553 BLAKE2B 0b9508bdf9327727eba2d3e44eb3b14d06d610d915f2199c524cb1e7b40497e0844ce8bfad318bb9052f46c19662dd8db8d67739450a49ce3b5ffac5bb6e4208 SHA512 793194ac2652d09b512cd95cbc2a4531418b11f1d9b119b8bf164af27b90db18938b8cc64a41944afe39fc115baf85c2fb161e60e458605498d0c23ca15c62b3
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD rostopic-1.15.7.ebuild 525 BLAKE2B 8f86ac03fad8e59435192c4239618ac5bbfd3da182ae54cc11d28421c024d021ef6b1872a24c1b341b2e2080d5eedb903040cc4ecdbb56f95165be7652e6f0a3 SHA512 7b742d6c5f394c7c91c4830551e80ded85af806e922bd0942c4ff4df0ce583f99f97d492b00dac1ae39b7c4b5d45888d8c1b9e8c153b98b0876556d882be086b
+EBUILD rostopic-9999.ebuild 525 BLAKE2B 8f86ac03fad8e59435192c4239618ac5bbfd3da182ae54cc11d28421c024d021ef6b1872a24c1b341b2e2080d5eedb903040cc4ecdbb56f95165be7652e6f0a3 SHA512 7b742d6c5f394c7c91c4830551e80ded85af806e922bd0942c4ff4df0ce583f99f97d492b00dac1ae39b7c4b5d45888d8c1b9e8c153b98b0876556d882be086b
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rostopic/files/py3.patch b/dev-ros/rostopic/files/py3.patch
deleted file mode 100644
index 51f5da5aa778..000000000000
--- a/dev-ros/rostopic/files/py3.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
-From: Dirk Thomas
-Date: Tue, 6 Aug 2019 16:06:51 -0700
-Subject: [PATCH] more Python 3 compatibility (#1783)
-
----
- test/test_rospy/test/unit/test_genmsg_py.py | 6 +--
- tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
- .../test/test_roslogging_user_logger.py | 8 +++-
- tools/roslaunch/test/unit/test_xmlloader.py | 2 +-
- tools/rosmsg/src/rosmsg/__init__.py | 2 +-
- tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
- .../test/test_rosmsgproto_command_line.py | 20 ++++----
- .../test_rostopic_command_line_offline.py | 44 +++++++++---------
- 8 files changed, 67 insertions(+), 63 deletions(-)
-
-diff --git a/tools/rostopic/test/test_rostopic_command_line_offline.py b/tools/rostopic/test/test_rostopic_command_line_offline.py
-index 5dab1ad16..37a81faaa 100644
---- a/tools/rostopic/test/test_rostopic_command_line_offline.py
-+++ b/tools/rostopic/test/test_rostopic_command_line_offline.py
-@@ -48,9 +48,9 @@ def test_cmd_help(self):
- cmd = 'rostopic'
-
- sub = ['bw', 'echo', 'hz', 'delay', 'info', 'list', 'pub', 'type','find']
-- output = Popen([cmd], stdout=PIPE).communicate()[0]
-+ output = Popen([cmd], stdout=PIPE).communicate()[0].decode()
- self.assert_('Commands' in output)
-- output = Popen([cmd, '-h'], stdout=PIPE).communicate()[0]
-+ output = Popen([cmd, '-h'], stdout=PIPE).communicate()[0].decode()
- self.assert_('Commands' in output)
- # make sure all the commands are in the usage
- for c in sub:
-@@ -59,16 +59,16 @@ def test_cmd_help(self):
-
- for c in sub:
- output = Popen([cmd, c, '-h'], stdout=PIPE, stderr=PIPE).communicate()
-- self.assert_("usage:" in output[0].lower(), output)
-+ self.assert_("usage:" in output[0].decode().lower(), output)
- # make sure usage refers to the command
-- self.assert_("%s %s"%(cmd, c) in output[0], output)
-+ self.assert_("%s %s"%(cmd, c) in output[0].decode(), output)
-
- # test no args on commands that require args
- for c in ['bw', 'echo', 'hz', 'delay', 'info', 'pub', 'type', 'find']:
- output = Popen([cmd, c], stdout=PIPE, stderr=PIPE).communicate()
-- self.assert_("usage:" in output[0].lower() or "usage:" in output[1].lower(), output)
-+ self.assert_("usage:" in output[0].decode().lower() or "usage:" in output[1].decode().lower(), output)
- # make sure usage refers to the command
-- self.assert_("%s %s"%(cmd, c) in output[1], output)
-+ self.assert_("%s %s"%(cmd, c) in output[1].decode(), output)
-
- def test_offline(self):
- cmd = 'rostopic'
-@@ -80,19 +80,19 @@ def test_offline(self):
-
- msg = "ERROR: Unable to communicate with master!\n"
-
-- output = Popen([cmd, 'bw', 'chatter'], **kwds).communicate()
-- self.assert_(output[1].endswith(msg))
-- output = Popen([cmd, 'echo', 'chatter'], **kwds).communicate()
-- self.assert_(output[1].endswith(msg))
-- output = Popen([cmd, 'hz', 'chatter'], **kwds).communicate()
-- self.assert_(output[1].endswith(msg))
-- output = Popen([cmd, 'delay', 'chatter'], **kwds).communicate()
-- self.assert_(output[1].endswith(msg))
-- output = Popen([cmd, 'list'], **kwds).communicate()
-- self.assert_(output[1].endswith(msg))
-- output = Popen([cmd, 'pub', 'chatter', 'std_msgs/String', 'hello'], **kwds).communicate()
-- self.assert_(output[1].endswith(msg))
-- output = Popen([cmd, 'type', 'chatter'], **kwds).communicate()
-- self.assert_(output[1].endswith(msg))
-- output = Popen([cmd, 'type', 'std_msgs/String'], **kwds).communicate()
-- self.assert_(output[1].endswith(msg))
-+ output = Popen([cmd, 'bw', 'chatter'], **kwds).communicate()[1].decode()
-+ self.assert_(output.endswith(msg))
-+ output = Popen([cmd, 'echo', 'chatter'], **kwds).communicate()[1].decode()
-+ self.assert_(output.endswith(msg))
-+ output = Popen([cmd, 'hz', 'chatter'], **kwds).communicate()[1].decode()
-+ self.assert_(output.endswith(msg))
-+ output = Popen([cmd, 'delay', 'chatter'], **kwds).communicate()[1].decode()
-+ self.assert_(output.endswith(msg))
-+ output = Popen([cmd, 'list'], **kwds).communicate()[1].decode()
-+ self.assert_(output.endswith(msg))
-+ output = Popen([cmd, 'pub', 'chatter', 'std_msgs/String', 'hello'], **kwds).communicate()[1].decode()
-+ self.assert_(output.endswith(msg))
-+ output = Popen([cmd, 'type', 'chatter'], **kwds).communicate()[1].decode()
-+ self.assert_(output.endswith(msg))
-+ output = Popen([cmd, 'type', 'std_msgs/String'], **kwds).communicate()[1].decode()
-+ self.assert_(output.endswith(msg))
diff --git a/dev-ros/rostopic/files/yaml.patch b/dev-ros/rostopic/files/yaml.patch
deleted file mode 100644
index e96337b50546..000000000000
--- a/dev-ros/rostopic/files/yaml.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py | 2 +-
- .../test/test_roslib_message.py | 2 +-
- .../client_verification/test_slave_api.py | 2 +-
- test/test_rosparam/test/check_rosparam.py | 8 ++---
- .../check_rosparam_command_line_online.py | 2 +-
- .../check_rosservice_command_line_online.py | 4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py | 2 +-
- tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
- tools/roslaunch/src/roslaunch/loader.py | 4 +--
- .../test/unit/test_roslaunch_dump_params.py | 4 +--
- tools/rosparam/src/rosparam/__init__.py | 7 ++++-
- tools/rosservice/src/rosservice/__init__.py | 4 +--
- tools/rostopic/src/rostopic/__init__.py | 6 ++--
- tools/topic_tools/scripts/relay_field | 2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/tools/rostopic/src/rostopic/__init__.py b/tools/rostopic/src/rostopic/__init__.py
-index ad244b0f0..41138562e 100644
---- a/tools/rostopic/src/rostopic/__init__.py
-+++ b/tools/rostopic/src/rostopic/__init__.py
-@@ -1779,7 +1779,7 @@ def _rostopic_cmd_pub(argv):
- try:
- pub_args = []
- for arg in args[2:]:
-- pub_args.append(yaml.load(arg))
-+ pub_args.append(yaml.safe_load(arg))
- except Exception as e:
- parser.error("Argument error: "+str(e))
-
-@@ -1822,7 +1822,7 @@ def bagy_iter():
- try:
- with open(filename, 'r') as f:
- # load all documents
-- data = yaml.load_all(f)
-+ data = yaml.safe_load_all(f)
- for d in data:
- yield [d]
- except yaml.YAMLError as e:
-@@ -2014,7 +2014,7 @@ def stdin_yaml_arg():
-
- if arg.strip() == '---': # End of document
- try:
-- loaded = yaml.load(buff.rstrip())
-+ loaded = yaml.safe_load(buff.rstrip())
- except Exception as e:
- sys.stderr.write("Invalid YAML: %s\n"%str(e))
- if loaded is not None:
diff --git a/dev-ros/rostopic/rostopic-1.14.3-r1.ebuild b/dev-ros/rostopic/rostopic-1.14.3-r1.ebuild
deleted file mode 100644
index 1f86a766a1ff..000000000000
--- a/dev-ros/rostopic/rostopic-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )
-"
-PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/rostopic/rostopic-1.15.4.ebuild b/dev-ros/rostopic/rostopic-1.15.4.ebuild
deleted file mode 100644
index 647d292a6d3f..000000000000
--- a/dev-ros/rostopic/rostopic-1.15.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/rostopic/rostopic-1.15.7.ebuild b/dev-ros/rostopic/rostopic-1.15.7.ebuild
new file mode 100644
index 000000000000..d1d5309b47b9
--- /dev/null
+++ b/dev-ros/rostopic/rostopic-1.15.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosbag[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ )
+"
diff --git a/dev-ros/rostopic/rostopic-9999.ebuild b/dev-ros/rostopic/rostopic-9999.ebuild
index 647d292a6d3f..d1d5309b47b9 100644
--- a/dev-ros/rostopic/rostopic-9999.ebuild
+++ b/dev-ros/rostopic/rostopic-9999.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/roswtf/Manifest b/dev-ros/roswtf/Manifest
index c77003c89686..364c47803ee0 100644
--- a/dev-ros/roswtf/Manifest
+++ b/dev-ros/roswtf/Manifest
@@ -1,20 +1,4 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD roswtf-1.13.0.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
-EBUILD roswtf-1.13.1.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
-EBUILD roswtf-1.13.2.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
-EBUILD roswtf-1.13.4.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
-EBUILD roswtf-1.13.5.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
-EBUILD roswtf-1.13.6.ebuild 662 BLAKE2B 7ca8fccb945abfa0b4c4c2048e1582063be1dd67276224522a9e568bb3947903a190a75b6f09306f1c273af70cec7a1d4b7979663244f746a14191d644034ae5 SHA512 086d738888864950509088d82d2d669397805523501addd75fb067220ee2b6cab9e515e469159fe5e0ed8a479780d6737c954d90d218401aacebbff868c8d43a
-EBUILD roswtf-1.14.2.ebuild 662 BLAKE2B 7ca8fccb945abfa0b4c4c2048e1582063be1dd67276224522a9e568bb3947903a190a75b6f09306f1c273af70cec7a1d4b7979663244f746a14191d644034ae5 SHA512 086d738888864950509088d82d2d669397805523501addd75fb067220ee2b6cab9e515e469159fe5e0ed8a479780d6737c954d90d218401aacebbff868c8d43a
-EBUILD roswtf-1.14.3.ebuild 662 BLAKE2B 7ca8fccb945abfa0b4c4c2048e1582063be1dd67276224522a9e568bb3947903a190a75b6f09306f1c273af70cec7a1d4b7979663244f746a14191d644034ae5 SHA512 086d738888864950509088d82d2d669397805523501addd75fb067220ee2b6cab9e515e469159fe5e0ed8a479780d6737c954d90d218401aacebbff868c8d43a
-EBUILD roswtf-1.15.4.ebuild 659 BLAKE2B b1818147b4f5824cbc501af4fa3ef2f6a5ac631bad99074ac3181b448c028319136cba5a9a45fc191aedeae600cbbcc7fd42408cd4168081602177d018e6cfa8 SHA512 123f30422b3413eceb996f6ee2ba4ceb6803752212cc0119b921b31751a31741da11c634e3cdcd29179f8ec88639942988aec9c2c28f8ad87f9b1469636e8691
-EBUILD roswtf-9999.ebuild 662 BLAKE2B f6ccaffa46e840f520e1bd63befdbab04d52c240055e63e28be2793904cff438ad64082558ca361855afcd5b2ecca94a4ef610a2406bb8ba42b5c8ddfdc72f09 SHA512 b3afa27d6bc9e241f10f67a9ae876123db28a5960a4d069b95f790901565285814b16604c98777339ec805d1f7f0fdde98eabf47f394aabad3a6d69eaacd29b5
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD roswtf-1.15.7.ebuild 631 BLAKE2B 384be54ee18f7e1a6267148eb0a91797f2a19956a5d92b51c6341b0229763137577d533d6b825326849d8e5aa92d3f5e205d0ac108c89c06b8b5fea6a000d823 SHA512 1d8a82ecf028e2edf1d22272b84ed98afb102deec6aca2a353d726f38ad5c4ba18191238a6e40c5125a0dc04cd46dc0e6442fce30f99efd459879453db0f41ea
+EBUILD roswtf-9999.ebuild 631 BLAKE2B 384be54ee18f7e1a6267148eb0a91797f2a19956a5d92b51c6341b0229763137577d533d6b825326849d8e5aa92d3f5e205d0ac108c89c06b8b5fea6a000d823 SHA512 1d8a82ecf028e2edf1d22272b84ed98afb102deec6aca2a353d726f38ad5c4ba18191238a6e40c5125a0dc04cd46dc0e6442fce30f99efd459879453db0f41ea
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roswtf/roswtf-1.13.0.ebuild b/dev-ros/roswtf/roswtf-1.13.0.ebuild
deleted file mode 100644
index beab39855484..000000000000
--- a/dev-ros/roswtf/roswtf-1.13.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-util/rosinstall[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/roswtf/roswtf-1.13.1.ebuild b/dev-ros/roswtf/roswtf-1.13.1.ebuild
deleted file mode 100644
index beab39855484..000000000000
--- a/dev-ros/roswtf/roswtf-1.13.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-util/rosinstall[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/roswtf/roswtf-1.13.2.ebuild b/dev-ros/roswtf/roswtf-1.13.2.ebuild
deleted file mode 100644
index beab39855484..000000000000
--- a/dev-ros/roswtf/roswtf-1.13.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-util/rosinstall[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/roswtf/roswtf-1.13.4.ebuild b/dev-ros/roswtf/roswtf-1.13.4.ebuild
deleted file mode 100644
index beab39855484..000000000000
--- a/dev-ros/roswtf/roswtf-1.13.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-util/rosinstall[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/roswtf/roswtf-1.13.5.ebuild b/dev-ros/roswtf/roswtf-1.13.5.ebuild
deleted file mode 100644
index beab39855484..000000000000
--- a/dev-ros/roswtf/roswtf-1.13.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-util/rosinstall[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/roswtf/roswtf-1.13.6.ebuild b/dev-ros/roswtf/roswtf-1.13.6.ebuild
deleted file mode 100644
index 396feee7b7a8..000000000000
--- a/dev-ros/roswtf/roswtf-1.13.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-util/rosinstall[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/roswtf/roswtf-1.14.2.ebuild b/dev-ros/roswtf/roswtf-1.14.2.ebuild
deleted file mode 100644
index 396feee7b7a8..000000000000
--- a/dev-ros/roswtf/roswtf-1.14.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-util/rosinstall[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/roswtf/roswtf-1.14.3.ebuild b/dev-ros/roswtf/roswtf-1.14.3.ebuild
deleted file mode 100644
index 396feee7b7a8..000000000000
--- a/dev-ros/roswtf/roswtf-1.14.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-util/rosinstall[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/roswtf/roswtf-1.15.4.ebuild b/dev-ros/roswtf/roswtf-1.15.4.ebuild
deleted file mode 100644
index ceae0cb87c1d..000000000000
--- a/dev-ros/roswtf/roswtf-1.15.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-util/rosinstall[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/roswtf/roswtf-1.15.7.ebuild b/dev-ros/roswtf/roswtf-1.15.7.ebuild
new file mode 100644
index 000000000000..6bad78a650a1
--- /dev/null
+++ b/dev-ros/roswtf/roswtf-1.15.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for diagnosing issues with a running ROS system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? (
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-util/rosdep[${PYTHON_USEDEP}]
+ dev-util/rosinstall[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ )"
diff --git a/dev-ros/roswtf/roswtf-9999.ebuild b/dev-ros/roswtf/roswtf-9999.ebuild
index 56857f7f1b57..6bad78a650a1 100644
--- a/dev-ros/roswtf/roswtf-9999.ebuild
+++ b/dev-ros/roswtf/roswtf-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/rqt_controller_manager/Manifest b/dev-ros/rqt_controller_manager/Manifest
index 40db017f37fc..2cb17e6d683e 100644
--- a/dev-ros/rqt_controller_manager/Manifest
+++ b/dev-ros/rqt_controller_manager/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD rqt_controller_manager-0.14.2.ebuild 444 BLAKE2B 8e17fabd016fe6becd7bea25962f907e2702f8db1665f5d94fae42b57b69f5cfc8bfa171c1dcea860c25c88e330badcdbc3eea2bbf957486b5b772dbee1114c3 SHA512 5852f5b38161ddf68dd2b80e4040cef61208035c29c3d4a5d7474aa769dfdb82b67562ed431bfba2302b0aa73daeb98e0238d0dcf2d0595dc876d695bc9a09a1
-EBUILD rqt_controller_manager-0.15.0.ebuild 444 BLAKE2B 8e17fabd016fe6becd7bea25962f907e2702f8db1665f5d94fae42b57b69f5cfc8bfa171c1dcea860c25c88e330badcdbc3eea2bbf957486b5b772dbee1114c3 SHA512 5852f5b38161ddf68dd2b80e4040cef61208035c29c3d4a5d7474aa769dfdb82b67562ed431bfba2302b0aa73daeb98e0238d0dcf2d0595dc876d695bc9a09a1
-EBUILD rqt_controller_manager-0.15.1.ebuild 441 BLAKE2B aabffe5b4421a3af947eb871694fc1cc89e763cbf03a3db3a7e59b4a7b71b36c70c917a0852096c22ea44c6a1c3f025165e7155c373eab2d0cfb7974028f54da SHA512 ed55e398d6af030542ba6c9b2b67af721fa3c804bb81326834228a5902a31be4eaba9558f36fdc3bb467e9b84670ea789dc47d30e39357bffe1f064d579142c5
-EBUILD rqt_controller_manager-9999.ebuild 444 BLAKE2B 3eed2feed983eb9d243723b27a3fea120d04e36d0c02b394f48f60e0ddbc211cfd3ade6286099419f6f158e077933f0b00d13d50f4eb13a4bcc7cde95a3203f1 SHA512 9ea5d8749c95f19ea690aa1d2bd2cc5d8a07f3cb2986a0b294fc9283ac35a16fb172ad2862d0d089ffab443a15eacb993f94625f7b7e1fb9ef7adec49eb986fa
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD rqt_controller_manager-0.19.1.ebuild 413 BLAKE2B 10819429ffa6c4c6e0dd19063851f5246bbdecc4e3d165d0472e98bcf80b2cb7bb9000dd314d0d26a5f77fe3fecb6220a32f2d9f5e181e6797015c25357e6b16 SHA512 3c22551949297c9b1f872681bff001a070419aeb1642024523e4b4e196fdef4cc0eab93909ef55d25ca564984dcce903e1b208d296338e19b59d34a743f6d0fa
+EBUILD rqt_controller_manager-9999.ebuild 413 BLAKE2B 10819429ffa6c4c6e0dd19063851f5246bbdecc4e3d165d0472e98bcf80b2cb7bb9000dd314d0d26a5f77fe3fecb6220a32f2d9f5e181e6797015c25357e6b16 SHA512 3c22551949297c9b1f872681bff001a070419aeb1642024523e4b4e196fdef4cc0eab93909ef55d25ca564984dcce903e1b208d296338e19b59d34a743f6d0fa
MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.14.2.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.14.2.ebuild
deleted file mode 100644
index 3f327270d905..000000000000
--- a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.14.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="RQT control manager plugin"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/controller_manager[${PYTHON_USEDEP}]
- dev-ros/rqt_gui[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.15.0.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.15.0.ebuild
deleted file mode 100644
index 3f327270d905..000000000000
--- a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.15.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="RQT control manager plugin"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/controller_manager[${PYTHON_USEDEP}]
- dev-ros/rqt_gui[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.15.1.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.15.1.ebuild
deleted file mode 100644
index c5e66c00d1f2..000000000000
--- a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.15.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="RQT control manager plugin"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/controller_manager[${PYTHON_USEDEP}]
- dev-ros/rqt_gui[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.1.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.1.ebuild
new file mode 100644
index 000000000000..086f2a36352a
--- /dev/null
+++ b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="RQT control manager plugin"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/controller_manager[${PYTHON_USEDEP}]
+ dev-ros/rqt_gui[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-9999.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-9999.ebuild
index 63a0aca8be84..086f2a36352a 100644
--- a/dev-ros/rqt_controller_manager/rqt_controller_manager-9999.ebuild
+++ b/dev-ros/rqt_controller_manager/rqt_controller_manager-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-controls/ros_control"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/rviz_imu_plugin/Manifest b/dev-ros/rviz_imu_plugin/Manifest
index a3313c20b00f..1c9c052434c9 100644
--- a/dev-ros/rviz_imu_plugin/Manifest
+++ b/dev-ros/rviz_imu_plugin/Manifest
@@ -1,8 +1,4 @@
-DIST imu_tools-1.1.5.tar.gz 1653083 BLAKE2B 8c0e84333455a5b4cae215a2e54b74ff828d00a426b9ab13f4048a72556b6a526dc4256a53dc3e21e098cc31ea6d21e0d508066a4627d01c27681ce0b3b18035 SHA512 5009884852c71d6bb1b6c2be2f30ed333eca2ac6a7f29d02cb8f0821c0b95a33dd3b09049c4c4eeb1416fb0eb5dc454b3c6d36c2c24303f37c0d1d2c0c2d906a
-DIST imu_tools-1.2.0.tar.gz 1653607 BLAKE2B 76cccfeae657188e3be3774bcb19c5edac94e7070a6fd8a01c8a56857297491568f978820e6f32467b031ceece4742e6c0fe926e5d59ad19a2f6fb1c037ac3ec SHA512 3f39a2ec539949a6881cc106122d663706ddd3ed03ed822b9370e56beb56f1349bfd668a71e443ab2b9d525c6a3a88fad053768764160d9d0f04c08ba1ad2f8e
-DIST imu_tools-1.2.1.tar.gz 1654279 BLAKE2B 06e3b27708bec09fea448b636f77b1480310483468459496e3748ef786e20e10f67fe25aba3c2d128221e42762e70fa98eedeeb79185247c47388c71120ed166 SHA512 8bd7f817df4e564d255fd5820dcbc6dd8ffa762d1b32111ed2f8d9cc258096cba1f9602260f020860fe2988eb1412c6d0598de08e4cd79ede56a40d1371d1ff0
-EBUILD rviz_imu_plugin-1.1.5-r1.ebuild 469 BLAKE2B 0f5068d4d4d812f3062ecd046884843c26a47a3c653b68cca70da3d3cd0b7e58e5d0def78a5365df0a6c2b5413504bcf3c3b09764b66c45b65aa5a294ed80071 SHA512 cb48900eae0268b9fc85e9b630da9e6b2d2eaee769279061012ceb8a2196c63d97afd010c9b1340c44369b604152d85147300ede6da6289bfc0ac0c90b4d4d62
-EBUILD rviz_imu_plugin-1.2.0.ebuild 469 BLAKE2B b5a5d6f9e05a3313ea31023d5bec80a35464fd4373156a11b2047a5c8ce29ab80ecb47df59e6962db97703ab72e20f1fa81c68b94a70cda6330a9e3fb6a45d30 SHA512 0efdcfd8766151e774db18ceeb8f8fcae833d7e699f75b4088517f1f344034247e5d19c53f08d762e261b82f2e36309ff0bcf7a84525fc34b2b4d3270e0442d5
-EBUILD rviz_imu_plugin-1.2.1.ebuild 466 BLAKE2B 53847bdd20178a98b7c16978cd6169dcb7047de54520b1df859b03dc8004f273339c6650b2b1bbbfbcabe94e7e0bda288224ddb6f1337e845e7e510d1d1ca5d0 SHA512 b460b6f6ac90c4267f4f101f897198cd8249c9acb571170b23e1a1a835fb069b8b8245dadd2c859a2c9c5162312a963f47e788f1ef393953bcc0d8fbe9e7c827
-EBUILD rviz_imu_plugin-9999.ebuild 469 BLAKE2B 0f5068d4d4d812f3062ecd046884843c26a47a3c653b68cca70da3d3cd0b7e58e5d0def78a5365df0a6c2b5413504bcf3c3b09764b66c45b65aa5a294ed80071 SHA512 cb48900eae0268b9fc85e9b630da9e6b2d2eaee769279061012ceb8a2196c63d97afd010c9b1340c44369b604152d85147300ede6da6289bfc0ac0c90b4d4d62
+DIST imu_tools-1.2.2.tar.gz 1654829 BLAKE2B 1cd0ce321f6a9012146da07fc7f24425c1e68a8144b1ec3e5fefda316d07c3bc579f63f14adc4b86fc4f3975ad2d5c575ecfb2ae729d54ae3876a2ce2aa9d7f3 SHA512 d4b746acdf39e5137f54de9ac27f338bf89cd4102af5407ae0b6bb45c830b6a7da9250570000a7ed140187659d93934e5ecc3f2b1722f686a5cc8cbd52e986be
+EBUILD rviz_imu_plugin-1.2.2.ebuild 466 BLAKE2B 5c124c4c7a1d71f90b84f08308d5b0283d89fc65195237fab77809bddade3ec22861c8e4742fcc959601a05c36fe7e80244f5916264e769ec7dae3bf01b28220 SHA512 a5b0edf3e1ad60fb88f38d5777c9b05abc9b797a6f40f002ce06ee1d0d48b1336ae03b8f244befa553aeac1c5aede8f0d816d6602aba8a2a8d73eb3afa74de60
+EBUILD rviz_imu_plugin-9999.ebuild 466 BLAKE2B 5c124c4c7a1d71f90b84f08308d5b0283d89fc65195237fab77809bddade3ec22861c8e4742fcc959601a05c36fe7e80244f5916264e769ec7dae3bf01b28220 SHA512 a5b0edf3e1ad60fb88f38d5777c9b05abc9b797a6f40f002ce06ee1d0d48b1336ae03b8f244befa553aeac1c5aede8f0d816d6602aba8a2a8d73eb3afa74de60
MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.1.5-r1.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.1.5-r1.ebuild
deleted file mode 100644
index 7f0d0fc9cd92..000000000000
--- a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="RVIZ plugin for IMU visualization"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-ros/roscpp
- dev-ros/rviz
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.0.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.0.ebuild
deleted file mode 100644
index 0c243ce8c89e..000000000000
--- a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="RVIZ plugin for IMU visualization"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-ros/roscpp
- dev-ros/rviz
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.1.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.1.ebuild
deleted file mode 100644
index f6636224b446..000000000000
--- a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="RVIZ plugin for IMU visualization"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-ros/roscpp
- dev-ros/rviz
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.2.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.2.ebuild
new file mode 100644
index 000000000000..93876d505729
--- /dev/null
+++ b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="RVIZ plugin for IMU visualization"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-ros/roscpp
+ dev-ros/rviz
+ dev-libs/boost:=
+ dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-9999.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-9999.ebuild
index 7f0d0fc9cd92..93876d505729 100644
--- a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-9999.ebuild
+++ b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
KEYWORDS="~amd64"
diff --git a/dev-ros/rviz_plugin_tutorials/Manifest b/dev-ros/rviz_plugin_tutorials/Manifest
index eb330b782809..24aef36f5e34 100644
--- a/dev-ros/rviz_plugin_tutorials/Manifest
+++ b/dev-ros/rviz_plugin_tutorials/Manifest
@@ -1,10 +1,4 @@
-DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
-DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
-DIST visualization_tutorials-0.10.3.tar.gz 428877 BLAKE2B 4bcd482ae61f29908ca23dda653d1c6d0e6a0a9df56df8343d1dfb5124f8d60c9a12ef8b1565c4655617dcd62d80a2aa51f2fd9b2c5329e33c3cc22e3e63c22d SHA512 2e484791851291d2316c7a20e92d988d71b6c41c98bad98c78bed465069dcfe5fc1ddd5c15c6981e951db2c114e965747c07e27f4851c2705af3dd036b992781
DIST visualization_tutorials-0.11.0.tar.gz 429489 BLAKE2B d4558a15b696ba05ed156a64ab2c0ad7229314f73d2823c0a46f53132801619d28fc5c68f5d8e0f3e2cadb7bb5078b3518da87ea18940432760b20bddeda578d SHA512 78ebe536a3a209fb0c61fb7dbc0aa115b5f4e6297303b1fc03740402decea719077037a90f4c45a0f6ece95e3578d6dad1095a0b1f0a90c136b738d0350aac9b
-EBUILD rviz_plugin_tutorials-0.10.1-r4.ebuild 485 BLAKE2B 66b0981eaa7c9c6c68080f2d95ab1716177cdef66cca4707136cbbb615dd5d182df90141af46ae600f85cbe2cde6ca4f111d230bc5918391043e449f564b2b13 SHA512 d31845c711675a6b21145b40abe1265f4e0993304baf68811ca60997d1764bc7cb0686893c79bfdc82170d93a15f0732cc624dd14208bdb0d02aaf0b784a4b90
-EBUILD rviz_plugin_tutorials-0.10.2.ebuild 485 BLAKE2B 006d43fcd28dcea0c19489210fa8f59b7636d17c331302f4071194bed98fcf3c3c38afba36d4c5547ac7ef0cf24e6983d1eb0092fb1f60166446ba1b4ac22c46 SHA512 733dd923bf39dd41c91f9a27c5d6c362362cefd631007c55fc09865c3a1ed70a3d48707e0394dbc84c39a45dc0e0e7f90e49e280caae67abec0a6128f7037dcb
-EBUILD rviz_plugin_tutorials-0.10.3.ebuild 485 BLAKE2B 006d43fcd28dcea0c19489210fa8f59b7636d17c331302f4071194bed98fcf3c3c38afba36d4c5547ac7ef0cf24e6983d1eb0092fb1f60166446ba1b4ac22c46 SHA512 733dd923bf39dd41c91f9a27c5d6c362362cefd631007c55fc09865c3a1ed70a3d48707e0394dbc84c39a45dc0e0e7f90e49e280caae67abec0a6128f7037dcb
-EBUILD rviz_plugin_tutorials-0.11.0.ebuild 482 BLAKE2B 6137da8d50fc8b59698db896c57052a6294254cb0f6781dafc2b4aa7cfd7bda5fbc478bce463bfab739644e1c03b293f20e197605c2abe080a04b3a5c4e627a8 SHA512 26845a42bf0c37f1b435c8b2abda5449bfbb34e6a3315b31f47dc3d6085c727c0b8c05c7a889ec22594b4cb29fc8ed7e47090c27ff5438366b276e1185074ba8
-EBUILD rviz_plugin_tutorials-9999.ebuild 485 BLAKE2B 66b0981eaa7c9c6c68080f2d95ab1716177cdef66cca4707136cbbb615dd5d182df90141af46ae600f85cbe2cde6ca4f111d230bc5918391043e449f564b2b13 SHA512 d31845c711675a6b21145b40abe1265f4e0993304baf68811ca60997d1764bc7cb0686893c79bfdc82170d93a15f0732cc624dd14208bdb0d02aaf0b784a4b90
+EBUILD rviz_plugin_tutorials-0.11.0.ebuild 482 BLAKE2B 91f8032d683c27004000fe658666791de41a8121fe3c3f6de51c10f1f827663d40af4e92929431327898f86f42c988144e0ba2e4e911a76d5b2ec9401b1a8aab SHA512 dbe1defae2c6d557360c5766e2400d0713020528a48ea724d8fdda7e2f36882a602a650534daa7374ab528b7bd3fde78fcb10c4bd389ed94016f81d4210609d8
+EBUILD rviz_plugin_tutorials-9999.ebuild 482 BLAKE2B 91f8032d683c27004000fe658666791de41a8121fe3c3f6de51c10f1f827663d40af4e92929431327898f86f42c988144e0ba2e4e911a76d5b2ec9401b1a8aab SHA512 dbe1defae2c6d557360c5766e2400d0713020528a48ea724d8fdda7e2f36882a602a650534daa7374ab528b7bd3fde78fcb10c4bd389ed94016f81d4210609d8
MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r4.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r4.ebuild
deleted file mode 100644
index 32ef17f584fc..000000000000
--- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorials showing how to write plugins for RViz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rviz
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.2.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.2.ebuild
deleted file mode 100644
index 1e7aa88d9e30..000000000000
--- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorials showing how to write plugins for RViz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rviz
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.3.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.3.ebuild
deleted file mode 100644
index 1e7aa88d9e30..000000000000
--- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorials showing how to write plugins for RViz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rviz
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.11.0.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.11.0.ebuild
index e57aebdcdd14..b6065822cd59 100644
--- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.11.0.ebuild
+++ b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.11.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild
index 32ef17f584fc..b6065822cd59 100644
--- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild
+++ b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
diff --git a/dev-ros/rviz_python_tutorial/Manifest b/dev-ros/rviz_python_tutorial/Manifest
index 3fdf1ee549e7..16a2104db27b 100644
--- a/dev-ros/rviz_python_tutorial/Manifest
+++ b/dev-ros/rviz_python_tutorial/Manifest
@@ -1,12 +1,4 @@
-DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
-DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
-DIST visualization_tutorials-0.10.3.tar.gz 428877 BLAKE2B 4bcd482ae61f29908ca23dda653d1c6d0e6a0a9df56df8343d1dfb5124f8d60c9a12ef8b1565c4655617dcd62d80a2aa51f2fd9b2c5329e33c3cc22e3e63c22d SHA512 2e484791851291d2316c7a20e92d988d71b6c41c98bad98c78bed465069dcfe5fc1ddd5c15c6981e951db2c114e965747c07e27f4851c2705af3dd036b992781
DIST visualization_tutorials-0.11.0.tar.gz 429489 BLAKE2B d4558a15b696ba05ed156a64ab2c0ad7229314f73d2823c0a46f53132801619d28fc5c68f5d8e0f3e2cadb7bb5078b3518da87ea18940432760b20bddeda578d SHA512 78ebe536a3a209fb0c61fb7dbc0aa115b5f4e6297303b1fc03740402decea719077037a90f4c45a0f6ece95e3578d6dad1095a0b1f0a90c136b738d0350aac9b
-DIST visualization_tutorials-0.9.2.tar.gz 428117 BLAKE2B f25320fa80b12a8a5499d505af369c33362e7f085de3846478b6376fc49e4e2502f07ded6c9e1025224d7b2418d78c87933b2d93b66ad2865eb45581384df24f SHA512 4a2b323e74725dbb77fbba6405d39246a89b170c66dec78288c4461d70c419efc3197eed5867f68305e490552d0480525153f98a64a3025efddc367db824ca53
-EBUILD rviz_python_tutorial-0.10.1.ebuild 452 BLAKE2B 1af501744428e5693ba71a326092d6d17ee9f8be078eabee5febc2a91b1ead2c6c491a2e1d4dcc66e17dd976bff21a878304c25ee35bcfc8c361e0b86bec4c2f SHA512 45d3339c26b33bb6af6d4fb859e670f1cb68e74fb8247da1106337aadce43b565320a053512d9f8ae1081aae9e840011e8050726f33659d3ef7c9386ceffcc95
-EBUILD rviz_python_tutorial-0.10.2.ebuild 452 BLAKE2B 7cb142425b38933b78c712a3de1f919647f00a7074cf234bb321c929cca089c7b35d10fbc5c85e88d6685a0bf562fec48c859fa4d1e40d61783a553b8b1803f2 SHA512 d0d18eb2f5b0602c9653261de0a2c3e1dc6014e29245b7a50f0518d444e711becf17af97029fdfcfa695760f9a735264b9a0d89eff1a17189aeac0bf2297b9c5
-EBUILD rviz_python_tutorial-0.10.3.ebuild 452 BLAKE2B 7cb142425b38933b78c712a3de1f919647f00a7074cf234bb321c929cca089c7b35d10fbc5c85e88d6685a0bf562fec48c859fa4d1e40d61783a553b8b1803f2 SHA512 d0d18eb2f5b0602c9653261de0a2c3e1dc6014e29245b7a50f0518d444e711becf17af97029fdfcfa695760f9a735264b9a0d89eff1a17189aeac0bf2297b9c5
-EBUILD rviz_python_tutorial-0.11.0.ebuild 449 BLAKE2B 8679cb260460b75e866d5efcc5e7b488e419718abaff9d1241bdd7f0a7820006e8598c9e0ad33d32c07fdd8a9803477ccc8eb34fe635d094aa85f120510a4259 SHA512 95da05a00f84eabc768d10a02c6a1b479c6c845b2021b2c05c1fd75f1684fad2265490c97814eb20582aebdc0bcb88ee578edc4a59a1cfcd97d592ef54a19b38
-EBUILD rviz_python_tutorial-0.9.2.ebuild 452 BLAKE2B 1af501744428e5693ba71a326092d6d17ee9f8be078eabee5febc2a91b1ead2c6c491a2e1d4dcc66e17dd976bff21a878304c25ee35bcfc8c361e0b86bec4c2f SHA512 45d3339c26b33bb6af6d4fb859e670f1cb68e74fb8247da1106337aadce43b565320a053512d9f8ae1081aae9e840011e8050726f33659d3ef7c9386ceffcc95
-EBUILD rviz_python_tutorial-9999.ebuild 452 BLAKE2B 1af501744428e5693ba71a326092d6d17ee9f8be078eabee5febc2a91b1ead2c6c491a2e1d4dcc66e17dd976bff21a878304c25ee35bcfc8c361e0b86bec4c2f SHA512 45d3339c26b33bb6af6d4fb859e670f1cb68e74fb8247da1106337aadce43b565320a053512d9f8ae1081aae9e840011e8050726f33659d3ef7c9386ceffcc95
+EBUILD rviz_python_tutorial-0.11.0.ebuild 421 BLAKE2B 264ba84740a12b5f7d652fca0f4cd6850325ceb67b6819d81c04205d583b074d8f336dde0ecf38a7c206fc3a425768e55eb337a0e983bc50c280e4ed6a646f78 SHA512 97551e72d635b8e5c28135dc5319c4236c79e79fb76391e553060b3a771c2b42cb80ff6e3a96471eb531bcb85b161384314d2bf1f29783f88a53e5ffb3c7e21a
+EBUILD rviz_python_tutorial-9999.ebuild 421 BLAKE2B 264ba84740a12b5f7d652fca0f4cd6850325ceb67b6819d81c04205d583b074d8f336dde0ecf38a7c206fc3a425768e55eb337a0e983bc50c280e4ed6a646f78 SHA512 97551e72d635b8e5c28135dc5319c4236c79e79fb76391e553060b3a771c2b42cb80ff6e3a96471eb531bcb85b161384314d2bf1f29783f88a53e5ffb3c7e21a
MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.1.ebuild b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.1.ebuild
deleted file mode 100644
index 0f81c43773ff..000000000000
--- a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorials showing how to call into rviz internals from python scripts"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rviz[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.2.ebuild b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.2.ebuild
deleted file mode 100644
index 0f3ef919f175..000000000000
--- a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorials showing how to call into rviz internals from python scripts"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rviz[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.3.ebuild b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.3.ebuild
deleted file mode 100644
index 0f3ef919f175..000000000000
--- a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorials showing how to call into rviz internals from python scripts"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rviz[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.11.0.ebuild b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.11.0.ebuild
index 2e6384a388d7..d3fe0c3a8df4 100644
--- a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.11.0.ebuild
+++ b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.11.0.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.9.2.ebuild b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.9.2.ebuild
deleted file mode 100644
index 0f81c43773ff..000000000000
--- a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.9.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorials showing how to call into rviz internals from python scripts"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rviz[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-9999.ebuild b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-9999.ebuild
index 0f81c43773ff..d3fe0c3a8df4 100644
--- a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-9999.ebuild
+++ b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/self_test/Manifest b/dev-ros/self_test/Manifest
index 6f5a58bf6f4d..576a1d46457d 100644
--- a/dev-ros/self_test/Manifest
+++ b/dev-ros/self_test/Manifest
@@ -1,14 +1,4 @@
-DIST diagnostics-1.8.10.tar.gz 525999 BLAKE2B 97d28f89c01fb8ee17fda9b0207f68848c57af754980562dce05d9eb76b1505f316ef64fe06a8a76db807d0b6d39657924e0f5c9dd8372a1df2fbefd51cacd8c SHA512 a3719b1cb745e376bbff55c483c92916588b4548c0c7b57cad299d3b748ca278a2d6b1a874168dd489b60a6dbc2250b40db1c55b54a4043de1b5c3ce3c8a5513
-DIST diagnostics-1.8.8.tar.gz 508404 BLAKE2B 9bf90d268ac23d0007133ddc5f2ac0d6ba445265b9cde19271d43274316af3ce734947a1a8a6226491c59e142a36e9f547edb996c797fec6ecaf143afa2c7363 SHA512 f0e59442cf4cd277c1ef77e7bceec973a15519c9d81bbde21851592ba52c4c7d55a6358c6a65004490b3e3822a6edc772f20e41992a2b3604d9e64e9fd7124ef
-DIST diagnostics-1.8.9.tar.gz 525881 BLAKE2B 6de75f5fa961da199daab1a6ae1c2b34b0edbd70c09e58f7384c76f9dd0c3a51cc8b0f20688dbdcafe164ade3a0e3bdc894064cc269f6b8fb0e31faa6f4d9654 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80
-DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
-DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
-DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
-EBUILD self_test-1.8.10.ebuild 465 BLAKE2B a5aad2726b233131331e309a6c23a906535f08dbc365c33515d34bc533cab445309231ea4e5189343d9987b8947cb2984404536ccb6f96418ce4bf782fc9983d SHA512 9baea4802e0e0b28548f5cb68b39e86ef32a0efaaae566465cb3b87ec511344ccdcf701e75f7c135c8f86ca2fcab4b30065e92b7020c9a193d95d285d365ef3e
-EBUILD self_test-1.8.8.ebuild 465 BLAKE2B e3bdb7edb258d01c1ea086e253166d05b83dbf0a7bd88940e269f35f33478d410c6e4e56944fa48b3ea7f86ced5dec60703d8adf25e16bf380a9bf5c5ef800c7 SHA512 b226692a78a29a877ba8986009e3bc505e2176c641a0100c059e1df483f62327a3da651c2bb89ea92f98b09dfeb72924f52c5b562502b4f5d1c82cd78925859d
-EBUILD self_test-1.8.9.ebuild 465 BLAKE2B e3bdb7edb258d01c1ea086e253166d05b83dbf0a7bd88940e269f35f33478d410c6e4e56944fa48b3ea7f86ced5dec60703d8adf25e16bf380a9bf5c5ef800c7 SHA512 b226692a78a29a877ba8986009e3bc505e2176c641a0100c059e1df483f62327a3da651c2bb89ea92f98b09dfeb72924f52c5b562502b4f5d1c82cd78925859d
-EBUILD self_test-1.9.0.ebuild 465 BLAKE2B 9bbb52cdfd989148345f8feea974c3562302702bde48d5dd4b10e73e3aad531186553613e821e73703a5f99ae8513e3354273389c003044f4470509e8c4233a4 SHA512 91bb83ba6bbb711667f115de8b59c7c67cb130779ad040b2b6f6349466b0fc8129749d098c08a02536babc8f7f8cd2492a00a35ff3b5ab21d04df3a1fcd2d016
-EBUILD self_test-1.9.2.ebuild 465 BLAKE2B 9bbb52cdfd989148345f8feea974c3562302702bde48d5dd4b10e73e3aad531186553613e821e73703a5f99ae8513e3354273389c003044f4470509e8c4233a4 SHA512 91bb83ba6bbb711667f115de8b59c7c67cb130779ad040b2b6f6349466b0fc8129749d098c08a02536babc8f7f8cd2492a00a35ff3b5ab21d04df3a1fcd2d016
-EBUILD self_test-1.9.3.ebuild 465 BLAKE2B 3818c10c15897497f44bbff4342113532ecce420d64f87621e58cc166a465f1da2e4066bde01742e357b2afa70bee29df66ec0d62f762083ea8f718d40ec738a SHA512 69b013df58f1d1c53af91a31ae34e6cd2e4888392c958907f50e86c6b431ee0a8cc60c862e278d09dd0d703382ce88eb26e6a4bfec200cbd7436e995b24e59cc
-EBUILD self_test-9999.ebuild 465 BLAKE2B e3bdb7edb258d01c1ea086e253166d05b83dbf0a7bd88940e269f35f33478d410c6e4e56944fa48b3ea7f86ced5dec60703d8adf25e16bf380a9bf5c5ef800c7 SHA512 b226692a78a29a877ba8986009e3bc505e2176c641a0100c059e1df483f62327a3da651c2bb89ea92f98b09dfeb72924f52c5b562502b4f5d1c82cd78925859d
+DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
+EBUILD self_test-1.9.4.ebuild 493 BLAKE2B 09ce9879215b47edf491883fa9d0491c9bee45152d8357b5c0d910abd6592b3848e2b81ee8310845361c1faa8f918b4e25a78cedb45e90df2066556f1cf15765 SHA512 5ac59c708a96cdce1fb4929e1223066ae234c55ffa0f9bf4c6267cc90fe949e403015c6b8e5593dc5687d2ed4de1137121e6193f2bb6eb2fabeafd673253e2d5
+EBUILD self_test-9999.ebuild 493 BLAKE2B 09ce9879215b47edf491883fa9d0491c9bee45152d8357b5c0d910abd6592b3848e2b81ee8310845361c1faa8f918b4e25a78cedb45e90df2066556f1cf15765 SHA512 5ac59c708a96cdce1fb4929e1223066ae234c55ffa0f9bf4c6267cc90fe949e403015c6b8e5593dc5687d2ed4de1137121e6193f2bb6eb2fabeafd673253e2d5
MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/self_test/self_test-1.8.10.ebuild b/dev-ros/self_test/self_test-1.8.10.ebuild
deleted file mode 100644
index 2f2fb6b266c6..000000000000
--- a/dev-ros/self_test/self_test-1.8.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs
- dev-ros/diagnostic_updater
- dev-ros/roscpp
- dev-ros/rostest
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest )"
diff --git a/dev-ros/self_test/self_test-1.8.8.ebuild b/dev-ros/self_test/self_test-1.8.8.ebuild
deleted file mode 100644
index 9d24c5969971..000000000000
--- a/dev-ros/self_test/self_test-1.8.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs
- dev-ros/diagnostic_updater
- dev-ros/roscpp
- dev-ros/rostest
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest )"
diff --git a/dev-ros/self_test/self_test-1.8.9.ebuild b/dev-ros/self_test/self_test-1.8.9.ebuild
deleted file mode 100644
index 9d24c5969971..000000000000
--- a/dev-ros/self_test/self_test-1.8.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs
- dev-ros/diagnostic_updater
- dev-ros/roscpp
- dev-ros/rostest
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest )"
diff --git a/dev-ros/self_test/self_test-1.9.0.ebuild b/dev-ros/self_test/self_test-1.9.0.ebuild
deleted file mode 100644
index a3bbb51a443c..000000000000
--- a/dev-ros/self_test/self_test-1.9.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs
- dev-ros/diagnostic_updater
- dev-ros/roscpp
- dev-ros/rostest
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest )"
diff --git a/dev-ros/self_test/self_test-1.9.2.ebuild b/dev-ros/self_test/self_test-1.9.2.ebuild
deleted file mode 100644
index a3bbb51a443c..000000000000
--- a/dev-ros/self_test/self_test-1.9.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs
- dev-ros/diagnostic_updater
- dev-ros/roscpp
- dev-ros/rostest
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest )"
diff --git a/dev-ros/self_test/self_test-1.9.3.ebuild b/dev-ros/self_test/self_test-1.9.3.ebuild
deleted file mode 100644
index 4be6495b629d..000000000000
--- a/dev-ros/self_test/self_test-1.9.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_msgs
- dev-ros/diagnostic_updater
- dev-ros/roscpp
- dev-ros/rostest
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest )"
diff --git a/dev-ros/self_test/self_test-1.9.4.ebuild b/dev-ros/self_test/self_test-1.9.4.ebuild
new file mode 100644
index 000000000000..3499355435bc
--- /dev/null
+++ b/dev-ros/self_test/self_test-1.9.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Robot self-test node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/diagnostic_updater
+ dev-ros/roscpp
+ dev-ros/rostest
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ test? ( dev-ros/rostest )"
diff --git a/dev-ros/self_test/self_test-9999.ebuild b/dev-ros/self_test/self_test-9999.ebuild
index 9d24c5969971..3499355435bc 100644
--- a/dev-ros/self_test/self_test-9999.ebuild
+++ b/dev-ros/self_test/self_test-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/diagnostics"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
@@ -14,11 +14,11 @@ SLOT="0"
IUSE=""
RDEPEND="
- dev-ros/diagnostic_msgs
dev-ros/diagnostic_updater
dev-ros/roscpp
dev-ros/rostest
dev-libs/boost:=[threads]
"
DEPEND="${RDEPEND}
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? ( dev-ros/rostest )"
diff --git a/dev-ros/sensor_msgs/Manifest b/dev-ros/sensor_msgs/Manifest
index 98be74d30090..f9f7f87fd1ab 100644
--- a/dev-ros/sensor_msgs/Manifest
+++ b/dev-ros/sensor_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-EBUILD sensor_msgs-1.12.5.ebuild 604 BLAKE2B 5fe485da8a62c62d29b1aa57ebe51a425b2492bd0ab4612a9162c70cddc7074a34d58d13a44d8870355c2172844196198986dfb326e34ce2eb8220a35156cb77 SHA512 8c495252f111f9f467417d88da7a13510395428dedb9aa2cfaa39d66ae9b992b95e1e1ecd9fad416427247b3f694f9aec924afc5360008c94f3a6626bb29cf86
-EBUILD sensor_msgs-1.12.6.ebuild 604 BLAKE2B 5fe485da8a62c62d29b1aa57ebe51a425b2492bd0ab4612a9162c70cddc7074a34d58d13a44d8870355c2172844196198986dfb326e34ce2eb8220a35156cb77 SHA512 8c495252f111f9f467417d88da7a13510395428dedb9aa2cfaa39d66ae9b992b95e1e1ecd9fad416427247b3f694f9aec924afc5360008c94f3a6626bb29cf86
-EBUILD sensor_msgs-1.12.7.ebuild 604 BLAKE2B 5fe485da8a62c62d29b1aa57ebe51a425b2492bd0ab4612a9162c70cddc7074a34d58d13a44d8870355c2172844196198986dfb326e34ce2eb8220a35156cb77 SHA512 8c495252f111f9f467417d88da7a13510395428dedb9aa2cfaa39d66ae9b992b95e1e1ecd9fad416427247b3f694f9aec924afc5360008c94f3a6626bb29cf86
-EBUILD sensor_msgs-9999.ebuild 604 BLAKE2B 5fe485da8a62c62d29b1aa57ebe51a425b2492bd0ab4612a9162c70cddc7074a34d58d13a44d8870355c2172844196198986dfb326e34ce2eb8220a35156cb77 SHA512 8c495252f111f9f467417d88da7a13510395428dedb9aa2cfaa39d66ae9b992b95e1e1ecd9fad416427247b3f694f9aec924afc5360008c94f3a6626bb29cf86
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
+EBUILD sensor_msgs-1.13.0.ebuild 554 BLAKE2B d8aa53196876a9fbffb44d706759ff1b7295ff011951d7016b18d27bfcee0046a387521af3d47ada0a9dd7ef00cd2254a076a955908c682510265d816d9dd3af SHA512 47b178cf84a688f3e57ddc9bea7e1cc8eb4db9f434794d247d65901a7d438d5b3e45962c6fe71efd49609222ebfe9a7b7be302f5260c8b355e71249d2b217021
+EBUILD sensor_msgs-9999.ebuild 554 BLAKE2B d8aa53196876a9fbffb44d706759ff1b7295ff011951d7016b18d27bfcee0046a387521af3d47ada0a9dd7ef00cd2254a076a955908c682510265d816d9dd3af SHA512 47b178cf84a688f3e57ddc9bea7e1cc8eb4db9f434794d247d65901a7d438d5b3e45962c6fe71efd49609222ebfe9a7b7be302f5260c8b355e71249d2b217021
MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/sensor_msgs/sensor_msgs-1.12.5.ebuild b/dev-ros/sensor_msgs/sensor_msgs-1.12.5.ebuild
deleted file mode 100644
index 99a3cc4151ad..000000000000
--- a/dev-ros/sensor_msgs/sensor_msgs-1.12.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for commonly used sensors, including cameras and scanning laser rangefinders"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
-"
-RDEPEND="${RDEPEND}"
diff --git a/dev-ros/sensor_msgs/sensor_msgs-1.12.6.ebuild b/dev-ros/sensor_msgs/sensor_msgs-1.12.6.ebuild
deleted file mode 100644
index 99a3cc4151ad..000000000000
--- a/dev-ros/sensor_msgs/sensor_msgs-1.12.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for commonly used sensors, including cameras and scanning laser rangefinders"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
-"
-RDEPEND="${RDEPEND}"
diff --git a/dev-ros/sensor_msgs/sensor_msgs-1.12.7.ebuild b/dev-ros/sensor_msgs/sensor_msgs-1.12.7.ebuild
deleted file mode 100644
index 99a3cc4151ad..000000000000
--- a/dev-ros/sensor_msgs/sensor_msgs-1.12.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for commonly used sensors, including cameras and scanning laser rangefinders"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
-"
-RDEPEND="${RDEPEND}"
diff --git a/dev-ros/sensor_msgs/sensor_msgs-1.13.0.ebuild b/dev-ros/sensor_msgs/sensor_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..345bedc726b9
--- /dev/null
+++ b/dev-ros/sensor_msgs/sensor_msgs-1.13.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for commonly used sensors: cameras and scanning laser rangefinders"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
+"
+RDEPEND="${RDEPEND}"
diff --git a/dev-ros/sensor_msgs/sensor_msgs-9999.ebuild b/dev-ros/sensor_msgs/sensor_msgs-9999.ebuild
index 99a3cc4151ad..345bedc726b9 100644
--- a/dev-ros/sensor_msgs/sensor_msgs-9999.ebuild
+++ b/dev-ros/sensor_msgs/sensor_msgs-9999.ebuild
@@ -1,17 +1,16 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/common_msgs"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
inherit ros-catkin
-DESCRIPTION="Messages for commonly used sensors, including cameras and scanning laser rangefinders"
+DESCRIPTION="Messages for commonly used sensors: cameras and scanning laser rangefinders"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/settlerlib/Manifest b/dev-ros/settlerlib/Manifest
index e4370b07541e..9660301fdda4 100644
--- a/dev-ros/settlerlib/Manifest
+++ b/dev-ros/settlerlib/Manifest
@@ -1,5 +1,5 @@
AUX gcc6.patch 537 BLAKE2B 21a31c5a9131e68c7b5acd22fac5d942daf7421416ea59b53d416041ef2300c1b0ce1d0d89a5268139cb83d98080db58544ad2679403f65fcc9a06cf97c61ba4 SHA512 d2de51575d8b6a16de4c72be2c1ac20a9a7383071036312954f375db22b403c8095113550d1a2de9dcff8dcac5ecb86c6f78e6a711ed9a2547a7870c82571d0b
DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD settlerlib-0.10.14.ebuild 576 BLAKE2B c8d0e867a13328a1ab7043546839287e23128270d3e80e80d44fbc1c2148976e314eb1cf95cf1d100076fe30df2bce8e3b04dcdd5d8f69024d72f8bda13d5c27 SHA512 2d1e2618c5c4482f1800f45b58cea22be26655620204d78c440ed394279e106ffa5a6676b534e4e31114ee7d886d6574d310c92073c931385ef6f992b88ae13c
-EBUILD settlerlib-9999.ebuild 539 BLAKE2B a9e6046c7f43fdd917d6835514c654a792a3cef1a778dee410a55881cbdab5934ca00bd2c65520cf6071f1a7ca88c4658178143343e31f60b508905a93896115 SHA512 a156bb532ad1a8856b1889c68136190c8596868b65bdc767c265f418b027fae52787a87f923b9ead5204d1bd02e6157eaff784f601a2e5826aa3a58f65dc04a9
+EBUILD settlerlib-0.10.14.ebuild 519 BLAKE2B 53246e5baa6fcaa5d1fb8578a74aaa532fda40e5093b8de596584ce7c1db4d0ff0e73e812fa06f4385ebb24a3fb9dcab7587af3d5d41fa03660e232696ebdfaa SHA512 ee1c139abc9566e14fe8c451eda97bdb6267de7c4e13c052066a966418b87e5895b1a3e7ae04bfeac3c36517a0ffa7223863ae223889f5aea308998aa23173af
+EBUILD settlerlib-9999.ebuild 519 BLAKE2B 53246e5baa6fcaa5d1fb8578a74aaa532fda40e5093b8de596584ce7c1db4d0ff0e73e812fa06f4385ebb24a3fb9dcab7587af3d5d41fa03660e232696ebdfaa SHA512 ee1c139abc9566e14fe8c451eda97bdb6267de7c4e13c052066a966418b87e5895b1a3e7ae04bfeac3c36517a0ffa7223863ae223889f5aea308998aa23173af
MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/settlerlib/settlerlib-0.10.14.ebuild b/dev-ros/settlerlib/settlerlib-0.10.14.ebuild
index b012573d0e1c..8279f8dc7bae 100644
--- a/dev-ros/settlerlib/settlerlib-0.10.14.ebuild
+++ b/dev-ros/settlerlib/settlerlib-0.10.14.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="Helper functions and routines to help creating a settler for a specific sensor channel"
+DESCRIPTION="Helper functions for creating a settler for a specific sensor channel"
LICENSE="BSD"
SLOT="0"
IUSE=""
RDEPEND="
dev-libs/boost:=
- dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/rosconsole
dev-ros/rostime
"
DEPEND="${RDEPEND}
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/settlerlib/settlerlib-9999.ebuild b/dev-ros/settlerlib/settlerlib-9999.ebuild
index d55b85a8406d..8279f8dc7bae 100644
--- a/dev-ros/settlerlib/settlerlib-9999.ebuild
+++ b/dev-ros/settlerlib/settlerlib-9999.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="Helper functions and routines to help creating a settler for a specific sensor channel"
+DESCRIPTION="Helper functions for creating a settler for a specific sensor channel"
LICENSE="BSD"
SLOT="0"
IUSE=""
RDEPEND="
dev-libs/boost:=
- dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/rosconsole
dev-ros/rostime
"
DEPEND="${RDEPEND}
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? ( dev-cpp/gtest )"
diff --git a/dev-ros/shape_msgs/Manifest b/dev-ros/shape_msgs/Manifest
index 206a5c6d1694..be33fe5c05d6 100644
--- a/dev-ros/shape_msgs/Manifest
+++ b/dev-ros/shape_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-EBUILD shape_msgs-1.12.5.ebuild 526 BLAKE2B 772661f7594c97d6fa54045ecf6509a8f511176c7edaef9809301428284810ea315ae936d1277b6917dcd4e45b0ed21608b15eab120ccde35e25b85a64d2777e SHA512 36e4401ed60ff408ff54b4b719068f5c7e7a442561d8f9d941324a771271116b9cafad7186aa224475b252d106831f28aff0761b8ca1f957debb1c8cf5b40270
-EBUILD shape_msgs-1.12.6.ebuild 526 BLAKE2B 772661f7594c97d6fa54045ecf6509a8f511176c7edaef9809301428284810ea315ae936d1277b6917dcd4e45b0ed21608b15eab120ccde35e25b85a64d2777e SHA512 36e4401ed60ff408ff54b4b719068f5c7e7a442561d8f9d941324a771271116b9cafad7186aa224475b252d106831f28aff0761b8ca1f957debb1c8cf5b40270
-EBUILD shape_msgs-1.12.7.ebuild 526 BLAKE2B 772661f7594c97d6fa54045ecf6509a8f511176c7edaef9809301428284810ea315ae936d1277b6917dcd4e45b0ed21608b15eab120ccde35e25b85a64d2777e SHA512 36e4401ed60ff408ff54b4b719068f5c7e7a442561d8f9d941324a771271116b9cafad7186aa224475b252d106831f28aff0761b8ca1f957debb1c8cf5b40270
-EBUILD shape_msgs-9999.ebuild 526 BLAKE2B 772661f7594c97d6fa54045ecf6509a8f511176c7edaef9809301428284810ea315ae936d1277b6917dcd4e45b0ed21608b15eab120ccde35e25b85a64d2777e SHA512 36e4401ed60ff408ff54b4b719068f5c7e7a442561d8f9d941324a771271116b9cafad7186aa224475b252d106831f28aff0761b8ca1f957debb1c8cf5b40270
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
+EBUILD shape_msgs-1.13.0.ebuild 478 BLAKE2B 438d32c87d5ed97472bc22e145fab4ac30c15c145b2616c7ea07594c634987de3eb0ab38dec55525b8a7fb8b9b0ac2a0e4948445ce7047b460c3e8e508267fdd SHA512 c28e23d4e19fddfd55e54dbe53433a2b5f199a7d322a5d7b916ee19750e4bcda5ecade89cdcb8c788073bb793f42ccc052e90228cc1cc37e3ce9f64c074c5bea
+EBUILD shape_msgs-9999.ebuild 478 BLAKE2B 438d32c87d5ed97472bc22e145fab4ac30c15c145b2616c7ea07594c634987de3eb0ab38dec55525b8a7fb8b9b0ac2a0e4948445ce7047b460c3e8e508267fdd SHA512 c28e23d4e19fddfd55e54dbe53433a2b5f199a7d322a5d7b916ee19750e4bcda5ecade89cdcb8c788073bb793f42ccc052e90228cc1cc37e3ce9f64c074c5bea
MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/shape_msgs/shape_msgs-1.12.5.ebuild b/dev-ros/shape_msgs/shape_msgs-1.12.5.ebuild
deleted file mode 100644
index 800d87f00161..000000000000
--- a/dev-ros/shape_msgs/shape_msgs-1.12.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for defining shapes, such as simple solid object primitives, planes, and meshes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/shape_msgs/shape_msgs-1.12.6.ebuild b/dev-ros/shape_msgs/shape_msgs-1.12.6.ebuild
deleted file mode 100644
index 800d87f00161..000000000000
--- a/dev-ros/shape_msgs/shape_msgs-1.12.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for defining shapes, such as simple solid object primitives, planes, and meshes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/shape_msgs/shape_msgs-1.12.7.ebuild b/dev-ros/shape_msgs/shape_msgs-1.12.7.ebuild
deleted file mode 100644
index 800d87f00161..000000000000
--- a/dev-ros/shape_msgs/shape_msgs-1.12.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for defining shapes, such as simple solid object primitives, planes, and meshes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/shape_msgs/shape_msgs-1.13.0.ebuild b/dev-ros/shape_msgs/shape_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..824dbef9db8a
--- /dev/null
+++ b/dev-ros/shape_msgs/shape_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for defining shapes: simple solid object primitives, planes, and meshes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/shape_msgs/shape_msgs-9999.ebuild b/dev-ros/shape_msgs/shape_msgs-9999.ebuild
index 800d87f00161..824dbef9db8a 100644
--- a/dev-ros/shape_msgs/shape_msgs-9999.ebuild
+++ b/dev-ros/shape_msgs/shape_msgs-9999.ebuild
@@ -1,17 +1,16 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/common_msgs"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
inherit ros-catkin
-DESCRIPTION="Messages for defining shapes, such as simple solid object primitives, planes, and meshes"
+DESCRIPTION="Messages for defining shapes: simple solid object primitives, planes, and meshes"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/shape_tools/Manifest b/dev-ros/shape_tools/Manifest
deleted file mode 100644
index ae817a7815d3..000000000000
--- a/dev-ros/shape_tools/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST shape_tools-0.2.1.tar.gz 3684 BLAKE2B bdc92056d3c92595243cd33c49c846fc91eb43576be2f4fac190eb09fa19695e7976496c3d4c6f036197666441cce6f92351648aa5a89a98377fa44d9d2d5cc8 SHA512 4d6da49528518776cb51ace908f0f0326b31b2928f0cb8ae0b12bcb0c1fdac99cbcd71f6bd3324d6aecc38a68a10012535b914a2349925eab1487eed8e1bede3
-EBUILD shape_tools-0.2.1.ebuild 637 BLAKE2B d3cfa9e3323105cc317349dd6749f4d0c20d8526edb5b99af81fe146475627fb90bbba8c5efbcbd95281686ec2e9f615e1b1492860799efd6f6f409513769307 SHA512 fb9b123810ef682917c6a148da59da3cbd85b82fee188bc89c23500a184b1ac2b98e81017abb067c960a028aee5d8d645c56d428f7260eb5150144c7c79f8c27
-EBUILD shape_tools-9999.ebuild 637 BLAKE2B d3cfa9e3323105cc317349dd6749f4d0c20d8526edb5b99af81fe146475627fb90bbba8c5efbcbd95281686ec2e9f615e1b1492860799efd6f6f409513769307 SHA512 fb9b123810ef682917c6a148da59da3cbd85b82fee188bc89c23500a184b1ac2b98e81017abb067c960a028aee5d8d645c56d428f7260eb5150144c7c79f8c27
-MISC metadata.xml 338 BLAKE2B af43f88379647e32b43627f2eee8d72a9bc3d42e4f1d73becd4a11c3921125486adf8f1cc61f247e9ffd96399991a51e1d32d67c313cb0c4ab6f9cdfacfa6e90 SHA512 cca0c8e2c77b741038575027d78d2520671d9ae820f74e69ef5913f7f7e12402e6643db4969c51bb932fb92e71a8cc19a0aab1c7719eb46b2eb966afd3e21651
diff --git a/dev-ros/shape_tools/metadata.xml b/dev-ros/shape_tools/metadata.xml
deleted file mode 100644
index fe1e16a33855..000000000000
--- a/dev-ros/shape_tools/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- ros@gentoo.org
- Gentoo ROS Project
-
-
- ros-planning/shape_tools
-
-
diff --git a/dev-ros/shape_tools/shape_tools-0.2.1.ebuild b/dev-ros/shape_tools/shape_tools-0.2.1.ebuild
deleted file mode 100644
index be5d89f8bd96..000000000000
--- a/dev-ros/shape_tools/shape_tools-0.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-planning/shape_tools"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for operating on shape messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
- -i CMakeLists.txt \
- || die
-}
diff --git a/dev-ros/shape_tools/shape_tools-9999.ebuild b/dev-ros/shape_tools/shape_tools-9999.ebuild
deleted file mode 100644
index be5d89f8bd96..000000000000
--- a/dev-ros/shape_tools/shape_tools-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-planning/shape_tools"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for operating on shape messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
- -i CMakeLists.txt \
- || die
-}
diff --git a/dev-ros/smach/Manifest b/dev-ros/smach/Manifest
index 938bbb908bde..f0c2029fa81d 100644
--- a/dev-ros/smach/Manifest
+++ b/dev-ros/smach/Manifest
@@ -1,4 +1,4 @@
-DIST executive_smach-2.0.1.tar.gz 42032 BLAKE2B 9271515a67436cd4873d4df5d1abae586af9ae856f9c90904732382e4824bd0bb23c820cd761017532604cde4c7c07ed4a98465b3267319dbc00b61b2d028dea SHA512 88be9ad6a0ec1e82e1592d26621fbbfe24e45640266f369cd03f192649bfd865e5a4ea576cf665161c0f89805e67b38b8b64b62a054ca1e217b99d8284f3b32a
-EBUILD smach-2.0.1.ebuild 413 BLAKE2B ee547e323bf5d5d6ff9009f3ac52b15771ebd713451f82cf6d578120ab7f9bea14233c2f19b072de562c88e41c575ebe231cf4a4a42b880773f240252a04739d SHA512 416ce343e90c984c12c597620d871d6154547584cbcdd0e92e157e2b6b5ffb27da3aa635f901869d62e902f8b58b5e0442a87e7321a07a49a4843016ca1f1198
-EBUILD smach-9999.ebuild 413 BLAKE2B ee547e323bf5d5d6ff9009f3ac52b15771ebd713451f82cf6d578120ab7f9bea14233c2f19b072de562c88e41c575ebe231cf4a4a42b880773f240252a04739d SHA512 416ce343e90c984c12c597620d871d6154547584cbcdd0e92e157e2b6b5ffb27da3aa635f901869d62e902f8b58b5e0442a87e7321a07a49a4843016ca1f1198
+DIST executive_smach-2.5.0.tar.gz 42305 BLAKE2B 0b220f7aeec00c8e625c64f169f76ba8e35a5669b55f1a71073c419c7ad82c1d0cdb0d40f9eb3a3b2db7aa593b8d5867ececbcc5037af1022fcdfd6c09f1ed9e SHA512 83d557c450e28502f22dd39f7b3aec2a64faec565d25ed60832a8915f88d6541aaa906de61d3588e2ceaf8a2bc9d41f64376663322d570fbcce284b617193bb1
+EBUILD smach-2.5.0.ebuild 373 BLAKE2B 0949bab25f522079f3b10d10e2211cc43024082f5d86b128686e66c4c7442892e7e16ee1729e377de05cc750c0ab5bf730141582d021059449ea6de869ffd452 SHA512 fbc19b2aaff43936506da552d6963f72e14645c34560159d15fd47cc8533cb19212e7f9b3aea418ca41b86ed69b1cee5e26a25b54fb25982ba56fa6b0f1b2202
+EBUILD smach-9999.ebuild 373 BLAKE2B 0949bab25f522079f3b10d10e2211cc43024082f5d86b128686e66c4c7442892e7e16ee1729e377de05cc750c0ab5bf730141582d021059449ea6de869ffd452 SHA512 fbc19b2aaff43936506da552d6963f72e14645c34560159d15fd47cc8533cb19212e7f9b3aea418ca41b86ed69b1cee5e26a25b54fb25982ba56fa6b0f1b2202
MISC metadata.xml 333 BLAKE2B 9464368a741c4058fe2563c0a8a575e29bf8a74c43430a6c6f7be286419f675a560290c95d2afdf6e942843e233680e86886237a43ebe8d36136ebd36b4feb04 SHA512 c5e649958133658717bd4d1723953187a4c9626c7a1143fa784bc10ef533165bcb386248a42e20e9c1f7de4147e34c5a09f1009c5c65a78e2ed8fa0ccfc56165
diff --git a/dev-ros/smach/smach-2.0.1.ebuild b/dev-ros/smach/smach-2.0.1.ebuild
deleted file mode 100644
index 31bf99833587..000000000000
--- a/dev-ros/smach/smach-2.0.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/executive_smach"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Task-level architecture for rapidly creating complex robot behavior"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/smach/smach-2.5.0.ebuild b/dev-ros/smach/smach-2.5.0.ebuild
new file mode 100644
index 000000000000..194897b43b81
--- /dev/null
+++ b/dev-ros/smach/smach-2.5.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/executive_smach"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Task-level architecture for rapidly creating complex robot behavior"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/smach/smach-9999.ebuild b/dev-ros/smach/smach-9999.ebuild
index 31bf99833587..194897b43b81 100644
--- a/dev-ros/smach/smach-9999.ebuild
+++ b/dev-ros/smach/smach-9999.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/executive_smach"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
ROS_SUBDIR=${PN}
inherit ros-catkin
diff --git a/dev-ros/smach_msgs/Manifest b/dev-ros/smach_msgs/Manifest
index 9ae29a5fc751..b318462fcfd7 100644
--- a/dev-ros/smach_msgs/Manifest
+++ b/dev-ros/smach_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST executive_smach-2.0.1.tar.gz 42032 BLAKE2B 9271515a67436cd4873d4df5d1abae586af9ae856f9c90904732382e4824bd0bb23c820cd761017532604cde4c7c07ed4a98465b3267319dbc00b61b2d028dea SHA512 88be9ad6a0ec1e82e1592d26621fbbfe24e45640266f369cd03f192649bfd865e5a4ea576cf665161c0f89805e67b38b8b64b62a054ca1e217b99d8284f3b32a
-EBUILD smach_msgs-2.0.1.ebuild 492 BLAKE2B c2ddd96dbafa632ac7a22d55933cb77a9dd2734d1ba4ead84af5561182eca8ecddf6e597895fdc15936aeadc14b8319f4195b30377dbd21cf78c8ab5db7ce392 SHA512 d746d8cb8ac00865955a20be94edd7316d9be0343cb49162a0ed54c69b20aef915b57188be6977e72d62a785ea7e947584a8a47ab76ea060bb9fee61bbf939f9
-EBUILD smach_msgs-9999.ebuild 492 BLAKE2B c2ddd96dbafa632ac7a22d55933cb77a9dd2734d1ba4ead84af5561182eca8ecddf6e597895fdc15936aeadc14b8319f4195b30377dbd21cf78c8ab5db7ce392 SHA512 d746d8cb8ac00865955a20be94edd7316d9be0343cb49162a0ed54c69b20aef915b57188be6977e72d62a785ea7e947584a8a47ab76ea060bb9fee61bbf939f9
+DIST executive_smach-2.5.0.tar.gz 42305 BLAKE2B 0b220f7aeec00c8e625c64f169f76ba8e35a5669b55f1a71073c419c7ad82c1d0cdb0d40f9eb3a3b2db7aa593b8d5867ececbcc5037af1022fcdfd6c09f1ed9e SHA512 83d557c450e28502f22dd39f7b3aec2a64faec565d25ed60832a8915f88d6541aaa906de61d3588e2ceaf8a2bc9d41f64376663322d570fbcce284b617193bb1
+EBUILD smach_msgs-2.5.0.ebuild 452 BLAKE2B d91a5851d336e5469999ee6a4a45ea7a64b22908eddeb3e134ce211ca1a8921f7e19acc0693d795c44705d3a2e3bea1e74e6b911f94ef08bcdae776ab3892221 SHA512 6f25b044018a788407d42745e6a16f1dcacc124d956ba42d35d631232dae1b97b45e4753ea95ca89a9e0f717abf9006dc3b56c0003cb3223ea6b8eaa84a6010b
+EBUILD smach_msgs-9999.ebuild 452 BLAKE2B d91a5851d336e5469999ee6a4a45ea7a64b22908eddeb3e134ce211ca1a8921f7e19acc0693d795c44705d3a2e3bea1e74e6b911f94ef08bcdae776ab3892221 SHA512 6f25b044018a788407d42745e6a16f1dcacc124d956ba42d35d631232dae1b97b45e4753ea95ca89a9e0f717abf9006dc3b56c0003cb3223ea6b8eaa84a6010b
MISC metadata.xml 333 BLAKE2B 9464368a741c4058fe2563c0a8a575e29bf8a74c43430a6c6f7be286419f675a560290c95d2afdf6e942843e233680e86886237a43ebe8d36136ebd36b4feb04 SHA512 c5e649958133658717bd4d1723953187a4c9626c7a1143fa784bc10ef533165bcb386248a42e20e9c1f7de4147e34c5a09f1009c5c65a78e2ed8fa0ccfc56165
diff --git a/dev-ros/smach_msgs/smach_msgs-2.0.1.ebuild b/dev-ros/smach_msgs/smach_msgs-2.0.1.ebuild
deleted file mode 100644
index 20cd3b0f678e..000000000000
--- a/dev-ros/smach_msgs/smach_msgs-2.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/executive_smach"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Set of messages that are used by the introspection interfaces for smach"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/smach_msgs/smach_msgs-2.5.0.ebuild b/dev-ros/smach_msgs/smach_msgs-2.5.0.ebuild
new file mode 100644
index 000000000000..43513fe5132f
--- /dev/null
+++ b/dev-ros/smach_msgs/smach_msgs-2.5.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/executive_smach"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Set of messages that are used by the introspection interfaces for smach"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/smach_msgs/smach_msgs-9999.ebuild b/dev-ros/smach_msgs/smach_msgs-9999.ebuild
index 20cd3b0f678e..43513fe5132f 100644
--- a/dev-ros/smach_msgs/smach_msgs-9999.ebuild
+++ b/dev-ros/smach_msgs/smach_msgs-9999.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/executive_smach"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
diff --git a/dev-ros/smach_ros/Manifest b/dev-ros/smach_ros/Manifest
index b41260e775cc..01b8ac91c8a7 100644
--- a/dev-ros/smach_ros/Manifest
+++ b/dev-ros/smach_ros/Manifest
@@ -1,6 +1,4 @@
-DIST executive_smach-2.0.0.tar.gz 39920 BLAKE2B 556e142927c5bdae710d575b03dbcd6f17151446264d8ff8e8978fd1d45222b1e5e8d9d8967cda8848101b8371b1738cffab638beb4d295437d314c2f399207c SHA512 e1970128f2a49e92e99821922351cb62c64d4367781397f6f6b3c20691c2712824edabe4e4a67264fe48555f3b0c8d1f1fd7bc8820fb6f5937f7c6a22815c601
-DIST executive_smach-2.0.1.tar.gz 42032 BLAKE2B 9271515a67436cd4873d4df5d1abae586af9ae856f9c90904732382e4824bd0bb23c820cd761017532604cde4c7c07ed4a98465b3267319dbc00b61b2d028dea SHA512 88be9ad6a0ec1e82e1592d26621fbbfe24e45640266f369cd03f192649bfd865e5a4ea576cf665161c0f89805e67b38b8b64b62a054ca1e217b99d8284f3b32a
-EBUILD smach_ros-2.0.0.ebuild 793 BLAKE2B 11603e66dd2d6601c7ab1ec5cf665667bef12fc5a8bd0fda067188b4e6c20a363de8cff8b936d4a85aa798a20c2ec91eb2b00e8bb2673f65b0759aceadd8c20d SHA512 e7051f2a5d375aa56c570cac30f8d0a1b9e6dfb33cd7732b484a8c4dcdd5513261143c579ec06f44ac21a8752a3ad05ea21caeac697aa601ae3f698b0daf3f99
-EBUILD smach_ros-2.0.1.ebuild 793 BLAKE2B 3bac339e753c23a87c590587e297597eed0828718b761ccabe308e88fa0188f941a84ec031278c2d5d0e739bd62e4cccb4b6f963501ab78acb3847bde4c0a34f SHA512 214de774ce0996f2544b54aa5c11c5924fe91622ff36d624ff8b795c23559d56fea814996cf42deaeb1206102f1904d76fbbd7330fc388dc9b71f9abf28729ad
-EBUILD smach_ros-9999.ebuild 793 BLAKE2B 11603e66dd2d6601c7ab1ec5cf665667bef12fc5a8bd0fda067188b4e6c20a363de8cff8b936d4a85aa798a20c2ec91eb2b00e8bb2673f65b0759aceadd8c20d SHA512 e7051f2a5d375aa56c570cac30f8d0a1b9e6dfb33cd7732b484a8c4dcdd5513261143c579ec06f44ac21a8752a3ad05ea21caeac697aa601ae3f698b0daf3f99
+DIST executive_smach-2.5.0.tar.gz 42305 BLAKE2B 0b220f7aeec00c8e625c64f169f76ba8e35a5669b55f1a71073c419c7ad82c1d0cdb0d40f9eb3a3b2db7aa593b8d5867ececbcc5037af1022fcdfd6c09f1ed9e SHA512 83d557c450e28502f22dd39f7b3aec2a64faec565d25ed60832a8915f88d6541aaa906de61d3588e2ceaf8a2bc9d41f64376663322d570fbcce284b617193bb1
+EBUILD smach_ros-2.5.0.ebuild 762 BLAKE2B a6d077ecfdf6034bb26f04fb2fac07576a8aa456f97fa9b1163aed8c515423e59951ac84fea87b57b8971193148431cf9e2fbaef2fab55f284c02527d8d11cbb SHA512 d354293931d6806ef8d0787f02ed46861192599ec6ad6dfb3d4d90027a2004c574dcdb351580fe31d304fe7c67d0c439a43abe5fb592bd4153888bc8d8a2a895
+EBUILD smach_ros-9999.ebuild 762 BLAKE2B a6d077ecfdf6034bb26f04fb2fac07576a8aa456f97fa9b1163aed8c515423e59951ac84fea87b57b8971193148431cf9e2fbaef2fab55f284c02527d8d11cbb SHA512 d354293931d6806ef8d0787f02ed46861192599ec6ad6dfb3d4d90027a2004c574dcdb351580fe31d304fe7c67d0c439a43abe5fb592bd4153888bc8d8a2a895
MISC metadata.xml 333 BLAKE2B 9464368a741c4058fe2563c0a8a575e29bf8a74c43430a6c6f7be286419f675a560290c95d2afdf6e942843e233680e86886237a43ebe8d36136ebd36b4feb04 SHA512 c5e649958133658717bd4d1723953187a4c9626c7a1143fa784bc10ef533165bcb386248a42e20e9c1f7de4147e34c5a09f1009c5c65a78e2ed8fa0ccfc56165
diff --git a/dev-ros/smach_ros/smach_ros-2.0.0.ebuild b/dev-ros/smach_ros/smach_ros-2.0.0.ebuild
deleted file mode 100644
index e2c6774ebe00..000000000000
--- a/dev-ros/smach_ros/smach_ros-2.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/executive_smach"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Extensions for the SMACH library to integrate it tightly with ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rostopic[${PYTHON_USEDEP}]
- dev-ros/actionlib[${PYTHON_USEDEP}]
- dev-ros/smach[${PYTHON_USEDEP}]
- dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/smach_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/smach_ros/smach_ros-2.0.1.ebuild b/dev-ros/smach_ros/smach_ros-2.0.1.ebuild
deleted file mode 100644
index d3df8eeab34e..000000000000
--- a/dev-ros/smach_ros/smach_ros-2.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/executive_smach"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Extensions for the SMACH library to integrate it tightly with ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rostopic[${PYTHON_USEDEP}]
- dev-ros/actionlib[${PYTHON_USEDEP}]
- dev-ros/smach[${PYTHON_USEDEP}]
- dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/smach_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/smach_ros/smach_ros-2.5.0.ebuild b/dev-ros/smach_ros/smach_ros-2.5.0.ebuild
new file mode 100644
index 000000000000..a168a09a372f
--- /dev/null
+++ b/dev-ros/smach_ros/smach_ros-2.5.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/executive_smach"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extensions for the SMACH library to integrate it tightly with ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rostopic[${PYTHON_USEDEP}]
+ dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/smach[${PYTHON_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/smach_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/smach_ros/smach_ros-9999.ebuild b/dev-ros/smach_ros/smach_ros-9999.ebuild
index e2c6774ebe00..a168a09a372f 100644
--- a/dev-ros/smach_ros/smach_ros-9999.ebuild
+++ b/dev-ros/smach_ros/smach_ros-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/executive_smach"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
diff --git a/dev-ros/smclib/Manifest b/dev-ros/smclib/Manifest
index bdf4666ae2e5..8dfb6e46562e 100644
--- a/dev-ros/smclib/Manifest
+++ b/dev-ros/smclib/Manifest
@@ -1,12 +1,4 @@
-DIST bond_core-1.7.19.tar.gz 31455 BLAKE2B 86b21d44624c0be8c9445b53d46541785d47fe36366e1d25305a689faa99577905730cd313b7789302ebc6677f85c361d8c51a523233ade11bd6b493ee986dd2 SHA512 63584fa465dba48def1c049e713b0438ea6dd15bd968ee5a1ef969e21540d2693eb61bffb40134dd28486c83c6e54d8db9c71af8f2949bd38a3f7c63be5b65fb
-DIST bond_core-1.8.0.tar.gz 32199 BLAKE2B 8b5f308c3ff4ee3cf4d969ffa7cc05433ab0b992865a782b9c63d8b27615a158fe1885302703aa357f486ea4409e9e07aa3b43bbef6d41fbd127a8bc2c7252cc SHA512 5519d5366d94403862f34ff16e06ead099a164e43987a113c5ec3d62a8d32430b81fc3bee557513dac05ce6bdb39e6bc3c1a3477573de74610217ea92d373526
-DIST bond_core-1.8.1.tar.gz 32283 BLAKE2B d9d99891507106bff4f4ef7beb80ef878c9ddbbbcb073ea5bbeba11c0d21a7f94dc12a9fc3daea26c4f7585c991bb6283244af8852cee47162185136e0a2d694 SHA512 767d47d7d69bf2a1e6ce5d403f1e0f248c9414998a077f9a0815976975c6ed071eb0338543b9947285b30f5135e410fc273ad4243e5478819286a96e94f4584c
-DIST bond_core-1.8.2.tar.gz 32541 BLAKE2B d2c3000dcd92399f8349f9fbcffbfb432f6f98128365296071ce478c41e9754def757ab26cc89a7e00a0c503ae037792cf494ab53a315fe95de9a56803b2d1ab SHA512 6cb0d5f7af42d1e558772a06ec62a8f31ec8716c72c4d04927301b222de0a67df246e288e777d2ebc9c78000d3bd0c4efe494ea184beb3c906343e83e443c844
-DIST bond_core-1.8.3.tar.gz 32831 BLAKE2B d0c71488436340eff92930006d995ecdd0e98248606b3a6588b36a057584ccc325f751cc170443d21212138bfca2d34c47bd88d4a8a0b719cce81de7bab3218f SHA512 9f9bb71b431199582a36da6ec53806f25fd28fcdfe42e34d60a759f07de98ec86e3f156bc95dc218f3c517e66be426fc30510e111ade9459dfefd74a9555943a
-EBUILD smclib-1.7.19.ebuild 432 BLAKE2B 8935d0c605be371d4f47e88008b9d372f9f4ec692bdcefe85c322c83e5881aea4794a5770a91d82c564a4654f4d2e97ddaddf0e2874fcfed9c1a12d8a4bf3c34 SHA512 ec29ee323fbd5346a31b15479f261a1763a56b8e632153e06428943e4212c72329976031e9dfcefc1a181e35bcc6e8c4029fb5c01d6156b743f9dd05f07f102b
-EBUILD smclib-1.8.0.ebuild 432 BLAKE2B 8935d0c605be371d4f47e88008b9d372f9f4ec692bdcefe85c322c83e5881aea4794a5770a91d82c564a4654f4d2e97ddaddf0e2874fcfed9c1a12d8a4bf3c34 SHA512 ec29ee323fbd5346a31b15479f261a1763a56b8e632153e06428943e4212c72329976031e9dfcefc1a181e35bcc6e8c4029fb5c01d6156b743f9dd05f07f102b
-EBUILD smclib-1.8.1.ebuild 432 BLAKE2B 8935d0c605be371d4f47e88008b9d372f9f4ec692bdcefe85c322c83e5881aea4794a5770a91d82c564a4654f4d2e97ddaddf0e2874fcfed9c1a12d8a4bf3c34 SHA512 ec29ee323fbd5346a31b15479f261a1763a56b8e632153e06428943e4212c72329976031e9dfcefc1a181e35bcc6e8c4029fb5c01d6156b743f9dd05f07f102b
-EBUILD smclib-1.8.2.ebuild 432 BLAKE2B 8935d0c605be371d4f47e88008b9d372f9f4ec692bdcefe85c322c83e5881aea4794a5770a91d82c564a4654f4d2e97ddaddf0e2874fcfed9c1a12d8a4bf3c34 SHA512 ec29ee323fbd5346a31b15479f261a1763a56b8e632153e06428943e4212c72329976031e9dfcefc1a181e35bcc6e8c4029fb5c01d6156b743f9dd05f07f102b
-EBUILD smclib-1.8.3.ebuild 432 BLAKE2B 8935d0c605be371d4f47e88008b9d372f9f4ec692bdcefe85c322c83e5881aea4794a5770a91d82c564a4654f4d2e97ddaddf0e2874fcfed9c1a12d8a4bf3c34 SHA512 ec29ee323fbd5346a31b15479f261a1763a56b8e632153e06428943e4212c72329976031e9dfcefc1a181e35bcc6e8c4029fb5c01d6156b743f9dd05f07f102b
-EBUILD smclib-9999.ebuild 432 BLAKE2B 8935d0c605be371d4f47e88008b9d372f9f4ec692bdcefe85c322c83e5881aea4794a5770a91d82c564a4654f4d2e97ddaddf0e2874fcfed9c1a12d8a4bf3c34 SHA512 ec29ee323fbd5346a31b15479f261a1763a56b8e632153e06428943e4212c72329976031e9dfcefc1a181e35bcc6e8c4029fb5c01d6156b743f9dd05f07f102b
+DIST bond_core-1.8.5.tar.gz 33713 BLAKE2B c18d77ac0d8ccf717dc5eba28ae560d4ce07aa7e4b077be5c38f46bccfe5b9fc218f47b72a553605e6c25d2b79e15decfceab5ce8ad8b211c6b1a91ab05cf7ba SHA512 544c0abc2e77debc984fdf6941b8f44b2a77b37ee50b4fd27418a296e8c489f445285358e32cc723d47a75bf0e289c9d49133a096efdbed26a0a058f3ea06609
+EBUILD smclib-1.8.5.ebuild 367 BLAKE2B 9daf6abe03aa5f84efd4c4aa74dd2d34f6b70addd1d02382ce4c937878d6d05215d5c8b8ffac98ddd99d88ff66e2241ac739552aa0acdcb78a387b750b51e882 SHA512 1b72233830837618182fd169132da5282b52a719cb09f4d6b37aae8b367bc0cdefef4fc1cceff74199dab6cff46f02c7d1745e59288e2132b04115995ab8e823
+EBUILD smclib-9999.ebuild 367 BLAKE2B 9daf6abe03aa5f84efd4c4aa74dd2d34f6b70addd1d02382ce4c937878d6d05215d5c8b8ffac98ddd99d88ff66e2241ac739552aa0acdcb78a387b750b51e882 SHA512 1b72233830837618182fd169132da5282b52a719cb09f4d6b37aae8b367bc0cdefef4fc1cceff74199dab6cff46f02c7d1745e59288e2132b04115995ab8e823
MISC metadata.xml 327 BLAKE2B e092eb0166dfaa1b0621bf8b428daa6d4d3ad9c5508865753ac6b8a7154c060d4328b695addd27d82aa2fe6dbfd2c3b9b1bfff3ae8f15d4f4a72e06952b1de15 SHA512 08675ab2448c90d64ccdc426a04ba319caa4be4291b8f5ede6b077ccecbf14aee898975525d12c9d0c97597b4d91be36e9ddfad18c5a5e4b072a58c0833828d3
diff --git a/dev-ros/smclib/smclib-1.7.19.ebuild b/dev-ros/smclib/smclib-1.7.19.ebuild
deleted file mode 100644
index fde15ce7faf0..000000000000
--- a/dev-ros/smclib/smclib-1.7.19.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="The State Machine Compiler (SMC) converts the description of a state machine into source code"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/smclib/smclib-1.8.0.ebuild b/dev-ros/smclib/smclib-1.8.0.ebuild
deleted file mode 100644
index fde15ce7faf0..000000000000
--- a/dev-ros/smclib/smclib-1.8.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="The State Machine Compiler (SMC) converts the description of a state machine into source code"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/smclib/smclib-1.8.1.ebuild b/dev-ros/smclib/smclib-1.8.1.ebuild
deleted file mode 100644
index fde15ce7faf0..000000000000
--- a/dev-ros/smclib/smclib-1.8.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="The State Machine Compiler (SMC) converts the description of a state machine into source code"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/smclib/smclib-1.8.2.ebuild b/dev-ros/smclib/smclib-1.8.2.ebuild
deleted file mode 100644
index fde15ce7faf0..000000000000
--- a/dev-ros/smclib/smclib-1.8.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="The State Machine Compiler (SMC) converts the description of a state machine into source code"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/smclib/smclib-1.8.3.ebuild b/dev-ros/smclib/smclib-1.8.3.ebuild
deleted file mode 100644
index fde15ce7faf0..000000000000
--- a/dev-ros/smclib/smclib-1.8.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="The State Machine Compiler (SMC) converts the description of a state machine into source code"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/smclib/smclib-1.8.5.ebuild b/dev-ros/smclib/smclib-1.8.5.ebuild
new file mode 100644
index 000000000000..eb5955f865ee
--- /dev/null
+++ b/dev-ros/smclib/smclib-1.8.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/bond_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="The SMC converts the description of a state machine into source code"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/smclib/smclib-9999.ebuild b/dev-ros/smclib/smclib-9999.ebuild
index fde15ce7faf0..eb5955f865ee 100644
--- a/dev-ros/smclib/smclib-9999.ebuild
+++ b/dev-ros/smclib/smclib-9999.ebuild
@@ -1,15 +1,14 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/bond_core"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
inherit ros-catkin
-DESCRIPTION="The State Machine Compiler (SMC) converts the description of a state machine into source code"
+DESCRIPTION="The SMC converts the description of a state machine into source code"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/stage_ros/Manifest b/dev-ros/stage_ros/Manifest
index 885cef7d23ea..f15ee89da23a 100644
--- a/dev-ros/stage_ros/Manifest
+++ b/dev-ros/stage_ros/Manifest
@@ -1,8 +1,4 @@
-AUX fltk.patch 1980 BLAKE2B e20ddc6695a2148a6bbb8e548a6f7676e7d9c34dd6a6f3667b5d523a4a23ca4bfc9529a9636b27752910da9b8605173a5f6e247d6510c66ee8fe8075a82fed2b SHA512 3d75b1181387e14f307704707f324792aa1ae932fc683926b1c88f2123ac18562f8e96aed634980707396bd367a8a6bd19af3ddd1ccaa7cafd0a7c1aa86558b9
-AUX stageconfig.patch 1780 BLAKE2B 9b9900a7f0bb83c90244b1720038cb2388b807af182fcf9a78aeefaf56801270b43779402762c31cb66a50bb13789409cd819a1430b1389779d328803fdbb101 SHA512 049e646983d8cb7bbb586b9f2bd7c89db7b94ed6d105b4f1208a4847317d338323b9fbd9e868733c90e2179788216aa872e90ec8d9990fda3b0560132329021a
-DIST stage_ros-1.7.5.tar.gz 58903 BLAKE2B 7bc31dc806560c3286cbc6b112d7e1af41429931ef88f2b85b460669ed5fc1e219c62ab1d733bf9a6ce311783ecfc865117e02890e53d80352b981daca481c8d SHA512 ce4e46f04d4440932f548ccb97745d421dbb5be41ead46df0f45a02e002c2ab672281277ad9835f8c40c001b823873299952b25d6758639a682b19ae470b9511
DIST stage_ros-1.8.0.tar.gz 59891 BLAKE2B a70708ce0e30418116a1b7b4a2f6b9bfa1e8f03b6562013f51a49e3a349ab0d7d8c090f61d620e4ef7c8d2e19f77165c04b05fb5ceeab061e9d88895cbb6eef7 SHA512 d953e819d1955e7b1f0ca5a3d91e5b052b485045c057ecfe210e8b31dd3b4aa3418ac642dbad87ce8925e74295661a9fee9b10d826c2b1a2a17f8ec478a87927
-EBUILD stage_ros-1.7.5.ebuild 699 BLAKE2B 12108b64c61004fbb2cfb999d86b997f2312251e891e0cbac1d8b18ad00a974e80a9c87860cc496d049409e48fae710da359c926a7313f5c75fe9b6f7fa82284 SHA512 89e47f1cf9e01af029dba9eb968bef560ccc6f4f9ae67e9ba6478b88b0f0b51f20f2bc925425e47bec3619ab59d34c2d7eead4d7b8216c9caf915065dad9d8ea
-EBUILD stage_ros-1.8.0.ebuild 638 BLAKE2B 70f66aae7197118049ff409c0b43483c02057cc7132eda9671c8f3570878ad3939a351216ab62b2402f98c093d9361ebbab55b5e8a1c44a83bbdd0fcfa0b7029 SHA512 d6320a5011b9ffb70f7102c2dc51671e39726e17e39cef242f97401ee7d6524f99877eacb69253e74f190d8dae78403e83fbebfc7e0aebcf0ce763ca86b47295
-EBUILD stage_ros-9999.ebuild 638 BLAKE2B 70f66aae7197118049ff409c0b43483c02057cc7132eda9671c8f3570878ad3939a351216ab62b2402f98c093d9361ebbab55b5e8a1c44a83bbdd0fcfa0b7029 SHA512 d6320a5011b9ffb70f7102c2dc51671e39726e17e39cef242f97401ee7d6524f99877eacb69253e74f190d8dae78403e83fbebfc7e0aebcf0ce763ca86b47295
+EBUILD stage_ros-1.8.0.ebuild 647 BLAKE2B a9c73810ed26c7d34560acf52e4beaf684a0f699f3447f837d1046f055899261eecefe340c687e581f6aa80720957b6bb896bbede67f1e9d3d1930634bb32309 SHA512 9d2006852d99fb12fb7dc2486d365e0edb066a998caef04253d46fc719ca5df4723ce78fedee868e948d109196a3abe6588d7ea85121431013bd4d5a0bb9fa62
+EBUILD stage_ros-9999.ebuild 647 BLAKE2B a9c73810ed26c7d34560acf52e4beaf684a0f699f3447f837d1046f055899261eecefe340c687e581f6aa80720957b6bb896bbede67f1e9d3d1930634bb32309 SHA512 9d2006852d99fb12fb7dc2486d365e0edb066a998caef04253d46fc719ca5df4723ce78fedee868e948d109196a3abe6588d7ea85121431013bd4d5a0bb9fa62
MISC metadata.xml 338 BLAKE2B be113ba641978d842732dba943269bfbecda305f280a1e594e66e80432987e754f04e83f1da5a94ba941e21900bd626f7dbfd0371dfd68077cd6f74b5531aab6 SHA512 60d3c473f35f325bd591eb4b81993b474b9477904362c8459266eed6c4da08c0bfdcf46deb8c9ab77dd28f11a07870374da80c49469b6a824d3d467d23455b7c
diff --git a/dev-ros/stage_ros/files/fltk.patch b/dev-ros/stage_ros/files/fltk.patch
deleted file mode 100644
index 3e7dc2582944..000000000000
--- a/dev-ros/stage_ros/files/fltk.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-commit c62d2b2e64e3d36cac91fbd656db8f69b7c42dc5
-Author: Alexis Ballier
-Date: Wed Sep 23 14:58:50 2015 +0200
-
- Revert "Remove all references to FLTK/Fluid"
-
- This reverts commit 933f2bf0b776ee028aaa4b58a382101d81fb042e.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7ddd2c7..f709ea5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,12 +14,27 @@ find_package(catkin REQUIRED
-
- find_package(Boost REQUIRED COMPONENTS system thread)
-
-+find_package(FLTK REQUIRED)
-+if(FLTK_FOUND)
-+ # FindFLTK.cmake doesn't populate FLTK_INCLUDE_DIRS on some systems,
-+ # so we try to use FLTK_INCLUDE_DIR if we need to.
-+ if("${FLTK_INCLUDE_DIRS}" STREQUAL "")
-+ set(FLTK_INCLUDE_DIRS "${FLTK_INCLUDE_DIR}")
-+ endif()
-+ message(status "FLTK_LIBRARIES=" ${FLTK_LIBRARIES})
-+ message(status "FLTK_INCLUDE_DIR=" ${FLTK_INCLUDE_DIR})
-+ message(status "FLTK_INCLUDE_DIRS=" ${FLTK_INCLUDE_DIRS})
-+else()
-+ message(fatal_error "FLTK not found...aborting!")
-+endif()
-+
- set(Stage_DIR cmake)
- find_package(Stage REQUIRED)
-
- include_directories(
- ${catkin_INCLUDE_DIRS}
- ${Boost_INCLUDE_DIRS}
-+ ${FLTK_INCLUDE_DIRS}
- ${Stage_INCLUDE_DIRS}
- )
-
-@@ -34,6 +49,7 @@ endif()
- target_link_libraries(stageros
- ${catkin_LIBRARIES}
- ${Boost_LIBRARIES}
-+ ${FLTK_LIBRARIES}
- ${Stage_LIBRARIES}
- ${${PROJECT_NAME}_extra_libs}
- )
-diff --git a/package.xml b/package.xml
-index 8803254..fde1a64 100644
---- a/package.xml
-+++ b/package.xml
-@@ -17,6 +17,7 @@
- catkin
-
- boost
-+ libfltk-dev
- geometry_msgs
- nav_msgs
- roscpp
-@@ -28,6 +29,7 @@
- tf
-
- boost
-+ fluid
- geometry_msgs
- nav_msgs
- roscpp
diff --git a/dev-ros/stage_ros/files/stageconfig.patch b/dev-ros/stage_ros/files/stageconfig.patch
deleted file mode 100644
index baadba4ec10c..000000000000
--- a/dev-ros/stage_ros/files/stageconfig.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-commit 7e9a04fef3b02510017d0ea3bbea047c32a408b1
-Author: Alexis Ballier
-Date: Wed Sep 23 14:55:50 2015 +0200
-
- Revert "Use upstream stage-config.cmake"
-
- This reverts commit 55700196507b44ea577233747de25dbf271cdef8.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 89c433d..7ddd2c7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,12 +14,13 @@ find_package(catkin REQUIRED
-
- find_package(Boost REQUIRED COMPONENTS system thread)
-
--find_package(stage REQUIRED)
-+set(Stage_DIR cmake)
-+find_package(Stage REQUIRED)
-
- include_directories(
- ${catkin_INCLUDE_DIRS}
- ${Boost_INCLUDE_DIRS}
-- ${STAGE_INCLUDE_DIRS}
-+ ${Stage_INCLUDE_DIRS}
- )
-
- catkin_package()
-@@ -33,7 +34,7 @@ endif()
- target_link_libraries(stageros
- ${catkin_LIBRARIES}
- ${Boost_LIBRARIES}
-- ${STAGE_LIBRARIES}
-+ ${Stage_LIBRARIES}
- ${${PROJECT_NAME}_extra_libs}
- )
- if(catkin_EXPORTED_TARGETS)
-diff --git a/cmake/StageConfig.cmake b/cmake/StageConfig.cmake
-new file mode 100644
-index 0000000..118e41c
---- /dev/null
-+++ b/cmake/StageConfig.cmake
-@@ -0,0 +1,30 @@
-+# - Try to find Stage
-+#
-+# Once done this will define
-+#
-+# Stage_FOUND - system has Stage
-+# Stage_INCLUDE_DIRS - the Stage include directory
-+# Stage_LIBRARIES - the Stage libraries
-+#
-+# Written by William Woodall
-+#
-+
-+find_package(PkgConfig)
-+pkg_check_modules(PC_Stage stage)
-+
-+find_library(Stage_LIBRARIES
-+ NAMES ${PC_Stage_LIBRARIES}
-+ PATHS ${PC_Stage_LIBRARY_DIRS}
-+)
-+
-+set(Stage_INCLUDE_DIRS ${PC_Stage_INCLUDE_DIRS})
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Stage
-+ DEFAULT_MSG
-+ Stage_LIBRARIES Stage_INCLUDE_DIRS
-+)
-+
-+mark_as_advanced(Stage_LIBRARIES Stage_INCLUDE_DIRS)
-+
-+set(Stage_FOUND ${STAGE_FOUND})
diff --git a/dev-ros/stage_ros/stage_ros-1.7.5.ebuild b/dev-ros/stage_ros/stage_ros-1.7.5.ebuild
deleted file mode 100644
index 748bdbbb4c6d..000000000000
--- a/dev-ros/stage_ros/stage_ros-1.7.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-simulation/stage_ros"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS specific hooks and tools for the Stage simulator"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/boost:=[threads]
- dev-ros/geometry_msgs
- dev-ros/nav_msgs
- dev-ros/roscpp
- dev-ros/rostest
- dev-ros/sensor_msgs
- dev-ros/std_msgs
- dev-ros/tf
- x11-libs/fltk
- sci-electronics/Stage
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest )
- virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/stageconfig.patch" "${FILESDIR}/fltk.patch" )
diff --git a/dev-ros/stage_ros/stage_ros-1.8.0.ebuild b/dev-ros/stage_ros/stage_ros-1.8.0.ebuild
index 3cdc7cdc4d1c..42b77b4d1dfd 100644
--- a/dev-ros/stage_ros/stage_ros-1.8.0.ebuild
+++ b/dev-ros/stage_ros/stage_ros-1.8.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-simulation/stage_ros"
KEYWORDS="~amd64"
@@ -24,8 +24,10 @@ RDEPEND="
dev-ros/tf
x11-libs/fltk
>=sci-electronics/Stage-4.3:=
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
DEPEND="${RDEPEND}
+ dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? ( dev-ros/rostest )
+"
+BDEPEND="
virtual/pkgconfig"
diff --git a/dev-ros/stage_ros/stage_ros-9999.ebuild b/dev-ros/stage_ros/stage_ros-9999.ebuild
index 3cdc7cdc4d1c..42b77b4d1dfd 100644
--- a/dev-ros/stage_ros/stage_ros-9999.ebuild
+++ b/dev-ros/stage_ros/stage_ros-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-simulation/stage_ros"
KEYWORDS="~amd64"
@@ -24,8 +24,10 @@ RDEPEND="
dev-ros/tf
x11-libs/fltk
>=sci-electronics/Stage-4.3:=
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
DEPEND="${RDEPEND}
+ dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? ( dev-ros/rostest )
+"
+BDEPEND="
virtual/pkgconfig"
diff --git a/dev-ros/std_msgs/Manifest b/dev-ros/std_msgs/Manifest
index 8282a76663ab..f3463c570cc0 100644
--- a/dev-ros/std_msgs/Manifest
+++ b/dev-ros/std_msgs/Manifest
@@ -1,6 +1,4 @@
-DIST std_msgs-0.5.11.tar.gz 6551 BLAKE2B d1ad69b21dd51272bd98a59d746d272c8b46628cb65688b1cb83c45fbc3e2ef3978916fe3830ef957f1ac6ae9478a30989664fb50d36a3c4b9187d6a1b8b533e SHA512 6cc7cdc4964c29e650d6dccbbd49095dc54a735e6e468e224179ad5a371b1f16a384f43b863c94f256fb2538fed5fd25967c5bd07b2d72ee31e997e1ac04fa7b
-DIST std_msgs-0.5.12.tar.gz 6545 BLAKE2B 4905063f43b280211366d8a5f6d8d6071398bbdac5c04ecaa62e0b118df892c757b1d2ca03b6748ed788e79a0e38b81856349199ab634108e19f75ec0c388962 SHA512 adfb561e39b64f5caf23a5be05e796dd13b16a748925f3c3fd8a5a69651b8268ea6767331ca4512d147edd4d284334d33291908e913bb6dd856e5a5d107150a7
-EBUILD std_msgs-0.5.11.ebuild 374 BLAKE2B 4a676748cd0aff3388fa74dc117a6f66ad9fe231bca57d1376aa4f375f941b3f246773a2e218e4d1a71180b012654d83f3e1ebc18ee8920b0089d3b06b752ad6 SHA512 7efe42685ab8a3023c757cad8a19bbae1dc8182e5e4715aaf1f100382017c72992bbef827bc97be9335808ee5c2742e3f6cb95e98ac1c229670d3f1e07887a31
-EBUILD std_msgs-0.5.12.ebuild 374 BLAKE2B 4a676748cd0aff3388fa74dc117a6f66ad9fe231bca57d1376aa4f375f941b3f246773a2e218e4d1a71180b012654d83f3e1ebc18ee8920b0089d3b06b752ad6 SHA512 7efe42685ab8a3023c757cad8a19bbae1dc8182e5e4715aaf1f100382017c72992bbef827bc97be9335808ee5c2742e3f6cb95e98ac1c229670d3f1e07887a31
-EBUILD std_msgs-9999.ebuild 374 BLAKE2B 4a676748cd0aff3388fa74dc117a6f66ad9fe231bca57d1376aa4f375f941b3f246773a2e218e4d1a71180b012654d83f3e1ebc18ee8920b0089d3b06b752ad6 SHA512 7efe42685ab8a3023c757cad8a19bbae1dc8182e5e4715aaf1f100382017c72992bbef827bc97be9335808ee5c2742e3f6cb95e98ac1c229670d3f1e07887a31
+DIST std_msgs-0.5.13.tar.gz 6557 BLAKE2B a07995e1f51319dcbc18d2f9fbaeb4bb208b00003dc85a2f7a15268e2391be55f2d1a4cfe7f980c5c19d7acb56c1073ddd05ac65a5bf2f690dd45856f83714a7 SHA512 a81af8d100b38fa6b093ad46ae0bc9916f3704ee7518aa68a31d96166d60e6f0fa4d2de4d0ba3b0d6ae7d209307fb2d2958fa53ffc3db8c0da49154a1d19f40d
+EBUILD std_msgs-0.5.13.ebuild 334 BLAKE2B 0ad143c6e6d432d992da4fe152c05de46df413ca1210b1115306a4ea4d98c0f20caf61ce894d7c143abf18da92f84344cdba10bf6bd81cb87a3d4dc486851154 SHA512 f389639d2f58f85ffc29a82e9a831b40fd01ba7ca9cebb8fe96e93ea13bd20c496bfe18d454bfb28d3dba137a4545c5aaa89e17e11e2b45a349dada0cbd85d3a
+EBUILD std_msgs-9999.ebuild 334 BLAKE2B 0ad143c6e6d432d992da4fe152c05de46df413ca1210b1115306a4ea4d98c0f20caf61ce894d7c143abf18da92f84344cdba10bf6bd81cb87a3d4dc486851154 SHA512 f389639d2f58f85ffc29a82e9a831b40fd01ba7ca9cebb8fe96e93ea13bd20c496bfe18d454bfb28d3dba137a4545c5aaa89e17e11e2b45a349dada0cbd85d3a
MISC metadata.xml 326 BLAKE2B 4b680ab2eb28397e602d23f97d16fd19b8530c9f9f36944a164a7dac2a9967775aa745c00d9848c4f9c5146323e51defedf82f30be0203c7ff96025e7462ecba SHA512 7849e2c2fc3e1d8ab8abf940aec65b4eea8adfabb974abd0990bef7a1b807ee6feda3a7a33922c3ebe90e447266256f816d9cebce91ce0c902a12c9f82d02c40
diff --git a/dev-ros/std_msgs/std_msgs-0.5.11.ebuild b/dev-ros/std_msgs/std_msgs-0.5.11.ebuild
deleted file mode 100644
index 02372598ccc3..000000000000
--- a/dev-ros/std_msgs/std_msgs-0.5.11.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/std_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ${SCM} ros-catkin
-
-DESCRIPTION="Standard ROS Messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/std_msgs/std_msgs-0.5.12.ebuild b/dev-ros/std_msgs/std_msgs-0.5.12.ebuild
deleted file mode 100644
index 02372598ccc3..000000000000
--- a/dev-ros/std_msgs/std_msgs-0.5.12.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/std_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ${SCM} ros-catkin
-
-DESCRIPTION="Standard ROS Messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/std_msgs/std_msgs-0.5.13.ebuild b/dev-ros/std_msgs/std_msgs-0.5.13.ebuild
new file mode 100644
index 000000000000..175f7b9d6ed4
--- /dev/null
+++ b/dev-ros/std_msgs/std_msgs-0.5.13.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/std_msgs"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+
+inherit ${SCM} ros-catkin
+
+DESCRIPTION="Standard ROS Messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/std_msgs/std_msgs-9999.ebuild b/dev-ros/std_msgs/std_msgs-9999.ebuild
index 02372598ccc3..175f7b9d6ed4 100644
--- a/dev-ros/std_msgs/std_msgs-9999.ebuild
+++ b/dev-ros/std_msgs/std_msgs-9999.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/std_msgs"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
inherit ${SCM} ros-catkin
diff --git a/dev-ros/std_srvs/Manifest b/dev-ros/std_srvs/Manifest
index d60b9b839890..7114b5ffdd15 100644
--- a/dev-ros/std_srvs/Manifest
+++ b/dev-ros/std_srvs/Manifest
@@ -1,4 +1,4 @@
-DIST ros_comm_msgs-1.11.2.tar.gz 2482 BLAKE2B 886f0bbbb00b0a291ba32ade834e466e03063087e0feaed9d7edbebb2871bc6ec314b4259bb728e662138384d455d5bbec5df49c5b1b6a448e98339cb3516ab7 SHA512 4750e234725b3cad8e2deb681f827e2f979f50bdfc0fccf4100288d2f663a68561f363702340b4569572837462cf6578f51213362d18b9694f6952fdcede1e6e
-EBUILD std_srvs-1.11.2.ebuild 397 BLAKE2B 03df24f3e5d574f8bbd299cd42d7811cf4ed0d812e19f8e8de20b2c8f201fd0f7f78a132c7e7ff470ab143392e4a464ed95b3ec66ea96dd45ca23bd75f4b86ab SHA512 9d54b326b4f9a8600e228092b7fc538b1f0e9504bc162e15a57b87182d4e92efa2b9dc7932547cdabfb35aeeb905bfc7e935a5e37eb866ad7873501f50f528ee
-EBUILD std_srvs-9999.ebuild 397 BLAKE2B 03df24f3e5d574f8bbd299cd42d7811cf4ed0d812e19f8e8de20b2c8f201fd0f7f78a132c7e7ff470ab143392e4a464ed95b3ec66ea96dd45ca23bd75f4b86ab SHA512 9d54b326b4f9a8600e228092b7fc538b1f0e9504bc162e15a57b87182d4e92efa2b9dc7932547cdabfb35aeeb905bfc7e935a5e37eb866ad7873501f50f528ee
+DIST ros_comm_msgs-1.11.3.tar.gz 2483 BLAKE2B dd6753d0cd5f285cce9343e29c3c593260708bcc7627850564fe6e3975511b55359ee790d6ddf6066e8433c2fa03bc576d9f7ec41ee0a5a362a9e42be2c87e65 SHA512 e7afef3326fbbfa9435ecaed9a553de74d694def975e5e2bdaff6cc671c8001cdef540defb90df936c0731bfa5d3d7d6e00300847271cd8d3c00ec59b24f1207
+EBUILD std_srvs-1.11.3.ebuild 357 BLAKE2B b09255da8ebdd5fa1f09f872e1e0be7439697d0415be822f994eaa5fb43678d20363d63114213bbb2ec9d8cbbeb9b506197a0012b762cb51b6bd34ccad871fec SHA512 1f79302f57d86f93b0ee48dde78cd9fe16efc51807d3d10553a27f0eacfca15765cbe36395bd028a9e965f73dfcd5bf44813390d1f94cc3972b9e93e0dce3b3e
+EBUILD std_srvs-9999.ebuild 357 BLAKE2B b09255da8ebdd5fa1f09f872e1e0be7439697d0415be822f994eaa5fb43678d20363d63114213bbb2ec9d8cbbeb9b506197a0012b762cb51b6bd34ccad871fec SHA512 1f79302f57d86f93b0ee48dde78cd9fe16efc51807d3d10553a27f0eacfca15765cbe36395bd028a9e965f73dfcd5bf44813390d1f94cc3972b9e93e0dce3b3e
MISC metadata.xml 331 BLAKE2B bb21abfb707c7a52640eeb013b04df43dd72b32d8f048207f2d0d0e23732dd2c5727a3bfbc6a1a84d7c4885ba560e15b1dcca0089b1a0e301d2491cc117b9c5d SHA512 365791913afec69e27e8c220acd643eb6ac8e13419a04d38a672a9ba50e696719563b246207abe70a1b945e42c1b61c3348f543f4d7a66b0b6cf62668769cf64
diff --git a/dev-ros/std_srvs/std_srvs-1.11.2.ebuild b/dev-ros/std_srvs/std_srvs-1.11.2.ebuild
deleted file mode 100644
index 884134e47a0b..000000000000
--- a/dev-ros/std_srvs/std_srvs-1.11.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/ros_comm_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Messages relating to ROS comm"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/std_srvs/std_srvs-1.11.3.ebuild b/dev-ros/std_srvs/std_srvs-1.11.3.ebuild
new file mode 100644
index 000000000000..52fdbcd95ba5
--- /dev/null
+++ b/dev-ros/std_srvs/std_srvs-1.11.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/ros_comm_msgs"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Messages relating to ROS comm"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/std_srvs/std_srvs-9999.ebuild b/dev-ros/std_srvs/std_srvs-9999.ebuild
index 884134e47a0b..52fdbcd95ba5 100644
--- a/dev-ros/std_srvs/std_srvs-9999.ebuild
+++ b/dev-ros/std_srvs/std_srvs-9999.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/ros_comm_msgs"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
ROS_SUBDIR=${PN}
inherit ros-catkin
diff --git a/dev-ros/stereo_image_proc/Manifest b/dev-ros/stereo_image_proc/Manifest
index 9015839bec67..beacc4b72f1f 100644
--- a/dev-ros/stereo_image_proc/Manifest
+++ b/dev-ros/stereo_image_proc/Manifest
@@ -1,8 +1,4 @@
-DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
-DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
-EBUILD stereo_image_proc-1.12.22-r1.ebuild 747 BLAKE2B c261006449b87dafd168ab81b5cd5391beffa44bd3a276ae50fbf2554865fa28d1abe945b3ba6a206ac46653d2371d0e9be37a864c705becabdde5a0fe8f8760 SHA512 d566dfb75d9bddff8a6b3cf18a79cb067469720bdc0206495e5b14e0ff2ec9460e973970d08a97c14915760eac924cc1ceddc0ca089b391812b7176453bae3a6
-EBUILD stereo_image_proc-1.12.23.ebuild 747 BLAKE2B e1b45ffc21bfdc2a06f87bfdd71de506b8379b6b17b6ee4b3d0fcb7b89e31346e955174698ba037f8de2adfee5f1df0db8221b408954be1a2b9106f1f8dcaba4 SHA512 1e0e9a8373864a500588ec2e78e76400fc8b39b8af80644e4392f75a6c05c56a12d3ccd2c6aef96c6679d2e0873a45ac13f4c92d0e269312a714eae245c05088
-EBUILD stereo_image_proc-1.13.0.ebuild 744 BLAKE2B a723f23aa38a6cb34c99d2ad820d4250d6d6d19319d4a6dcaf75739b308d56e7b5780d091761d95a9e2705af81caafeabddc327c49d5b69220a136f8bd0d2571 SHA512 d5de26a40f7f11feed5ef9f0cf3900c3997822bdb32bb89195ce74d1f2a32a73f8b91579b68d62999cc43db69ea5e4cedb34eae593ccb1482fdbff92192e2e09
-EBUILD stereo_image_proc-9999.ebuild 747 BLAKE2B c261006449b87dafd168ab81b5cd5391beffa44bd3a276ae50fbf2554865fa28d1abe945b3ba6a206ac46653d2371d0e9be37a864c705becabdde5a0fe8f8760 SHA512 d566dfb75d9bddff8a6b3cf18a79cb067469720bdc0206495e5b14e0ff2ec9460e973970d08a97c14915760eac924cc1ceddc0ca089b391812b7176453bae3a6
+DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
+EBUILD stereo_image_proc-1.15.2.ebuild 717 BLAKE2B 02d2170546fc55efc6ce112e8650f1d8f19bb792796366c241e86337a10b3a9dec575253b064e4f77a0e1e1ed2ab15e035200bc5b9be3b80134e524d19f73a73 SHA512 3ffaf962ef233f1abb375d6f4834af13f1be9aa1bfa90019c3a2efa20e161555ea0657b4c76ae33790fcc0068633cc427ad60f30d8b1c88f9f6eae30f2ee7e51
+EBUILD stereo_image_proc-9999.ebuild 717 BLAKE2B 02d2170546fc55efc6ce112e8650f1d8f19bb792796366c241e86337a10b3a9dec575253b064e4f77a0e1e1ed2ab15e035200bc5b9be3b80134e524d19f73a73 SHA512 3ffaf962ef233f1abb375d6f4834af13f1be9aa1bfa90019c3a2efa20e161555ea0657b4c76ae33790fcc0068633cc427ad60f30d8b1c88f9f6eae30f2ee7e51
MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.22-r1.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.22-r1.ebuild
deleted file mode 100644
index 85c2ee4ab95f..000000000000
--- a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.22-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Stereo and single image rectification and disparity processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- dev-ros/dynamic_reconfigure
- dev-ros/image_geometry
- dev-ros/image_proc
- dev-ros/image_transport
- dev-ros/message_filters
- dev-ros/nodelet
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- media-libs/opencv:=
- dev-libs/boost:=[threads]
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.23.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.23.ebuild
deleted file mode 100644
index feab50d5cf8f..000000000000
--- a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.23.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Stereo and single image rectification and disparity processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- dev-ros/dynamic_reconfigure
- dev-ros/image_geometry
- dev-ros/image_proc
- dev-ros/image_transport
- dev-ros/message_filters
- dev-ros/nodelet
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- media-libs/opencv:=
- dev-libs/boost:=[threads]
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.13.0.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.13.0.ebuild
deleted file mode 100644
index 7b954876330c..000000000000
--- a/dev-ros/stereo_image_proc/stereo_image_proc-1.13.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Stereo and single image rectification and disparity processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- dev-ros/dynamic_reconfigure
- dev-ros/image_geometry
- dev-ros/image_proc
- dev-ros/image_transport
- dev-ros/message_filters
- dev-ros/nodelet
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- media-libs/opencv:=
- dev-libs/boost:=[threads]
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.15.2.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.15.2.ebuild
new file mode 100644
index 000000000000..ff207309d3ff
--- /dev/null
+++ b/dev-ros/stereo_image_proc/stereo_image_proc-1.15.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Stereo and single image rectification and disparity processing"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge
+ dev-ros/dynamic_reconfigure
+ dev-ros/image_geometry
+ dev-ros/image_proc
+ dev-ros/image_transport
+ dev-ros/message_filters
+ dev-ros/nodelet
+ media-libs/opencv:=
+ dev-libs/boost:=[threads]
+ dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-9999.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-9999.ebuild
index 85c2ee4ab95f..ff207309d3ff 100644
--- a/dev-ros/stereo_image_proc/stereo_image_proc-9999.ebuild
+++ b/dev-ros/stereo_image_proc/stereo_image_proc-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
@@ -22,10 +21,11 @@ RDEPEND="
dev-ros/image_transport
dev-ros/message_filters
dev-ros/nodelet
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
media-libs/opencv:=
dev-libs/boost:=[threads]
dev-libs/console_bridge:=
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/stereo_msgs/Manifest b/dev-ros/stereo_msgs/Manifest
index be5f88fbbf4c..53b7d9616a9b 100644
--- a/dev-ros/stereo_msgs/Manifest
+++ b/dev-ros/stereo_msgs/Manifest
@@ -1,12 +1,4 @@
-DIST common_msgs-1.12.3.tar.gz 55960 BLAKE2B 448892dae7b2a399d0ba9964830875dc18af19920b4f346b4dd22176e023f895a105cc63f72a6440d9743743b5e082a96e88a077f3bfdb947e130468a8de0a15 SHA512 5c7a7362bb1024409c6da3e228e86d701a8df111481ddb831967b6eb447a32da5108ba7421509896628055ddeb2045441ec625178119aebf53a95cd933939cb7
-DIST common_msgs-1.12.4.tar.gz 58764 BLAKE2B 0cc1bdcf59882b3ba54683f1254aa7dd0d3bb61aa7cc1e1a27295fc31281badcda14c2ffb1231e2a6ffcdd43d3c386255b0ddebf1534711e7ccad475d98c4e06 SHA512 4605264f44dcaf6d970be9278de7433fa933d96eb9e4e6355b417c8f4a378eec03106414f3d9ca22cd7960435b2da714c76d40dfc8073dd887038cbecda7bf28
-DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-EBUILD stereo_msgs-1.12.3.ebuild 488 BLAKE2B d95f6dbfb677f1eb3581c5866dffabe864f32b858c51f69df18af605eafec996337d385fb360c7bb93483cd0845ae1ccd0fc4bed2a516b3c9a7ae540e70dd2ac SHA512 1034ffb7aba3114b1a96c7d6b020445d6211f7b01b393cbcf4e8cc29c87e884f52e32a4bf647920f3876eae9b030925b8cf5adb072d8cfcbed7a22dab2d31f6a
-EBUILD stereo_msgs-1.12.4.ebuild 488 BLAKE2B d95f6dbfb677f1eb3581c5866dffabe864f32b858c51f69df18af605eafec996337d385fb360c7bb93483cd0845ae1ccd0fc4bed2a516b3c9a7ae540e70dd2ac SHA512 1034ffb7aba3114b1a96c7d6b020445d6211f7b01b393cbcf4e8cc29c87e884f52e32a4bf647920f3876eae9b030925b8cf5adb072d8cfcbed7a22dab2d31f6a
-EBUILD stereo_msgs-1.12.5.ebuild 488 BLAKE2B d95f6dbfb677f1eb3581c5866dffabe864f32b858c51f69df18af605eafec996337d385fb360c7bb93483cd0845ae1ccd0fc4bed2a516b3c9a7ae540e70dd2ac SHA512 1034ffb7aba3114b1a96c7d6b020445d6211f7b01b393cbcf4e8cc29c87e884f52e32a4bf647920f3876eae9b030925b8cf5adb072d8cfcbed7a22dab2d31f6a
-EBUILD stereo_msgs-1.12.6.ebuild 488 BLAKE2B d95f6dbfb677f1eb3581c5866dffabe864f32b858c51f69df18af605eafec996337d385fb360c7bb93483cd0845ae1ccd0fc4bed2a516b3c9a7ae540e70dd2ac SHA512 1034ffb7aba3114b1a96c7d6b020445d6211f7b01b393cbcf4e8cc29c87e884f52e32a4bf647920f3876eae9b030925b8cf5adb072d8cfcbed7a22dab2d31f6a
-EBUILD stereo_msgs-1.12.7.ebuild 488 BLAKE2B d95f6dbfb677f1eb3581c5866dffabe864f32b858c51f69df18af605eafec996337d385fb360c7bb93483cd0845ae1ccd0fc4bed2a516b3c9a7ae540e70dd2ac SHA512 1034ffb7aba3114b1a96c7d6b020445d6211f7b01b393cbcf4e8cc29c87e884f52e32a4bf647920f3876eae9b030925b8cf5adb072d8cfcbed7a22dab2d31f6a
-EBUILD stereo_msgs-9999.ebuild 488 BLAKE2B d95f6dbfb677f1eb3581c5866dffabe864f32b858c51f69df18af605eafec996337d385fb360c7bb93483cd0845ae1ccd0fc4bed2a516b3c9a7ae540e70dd2ac SHA512 1034ffb7aba3114b1a96c7d6b020445d6211f7b01b393cbcf4e8cc29c87e884f52e32a4bf647920f3876eae9b030925b8cf5adb072d8cfcbed7a22dab2d31f6a
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
+EBUILD stereo_msgs-1.13.0.ebuild 460 BLAKE2B 93fa5c003de0f86b0ddbae4bfa155b7678445eb0306d6cd8f92b097b12a1fb6e0d4c7defcc5041179e4dac2a224d248e8b130fe25363cdb1d1d97bd2e2349f01 SHA512 0e4299c33327decc91386aa54698d44966e7484ad960b485b9337b29478fdc2111fed3b179b86f81e7a02c7a4adf94daf178b6d668a8b4002ada0b9f79552019
+EBUILD stereo_msgs-9999.ebuild 460 BLAKE2B 93fa5c003de0f86b0ddbae4bfa155b7678445eb0306d6cd8f92b097b12a1fb6e0d4c7defcc5041179e4dac2a224d248e8b130fe25363cdb1d1d97bd2e2349f01 SHA512 0e4299c33327decc91386aa54698d44966e7484ad960b485b9337b29478fdc2111fed3b179b86f81e7a02c7a4adf94daf178b6d668a8b4002ada0b9f79552019
MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/stereo_msgs/stereo_msgs-1.12.3.ebuild b/dev-ros/stereo_msgs/stereo_msgs-1.12.3.ebuild
deleted file mode 100644
index e52d3c2cb983..000000000000
--- a/dev-ros/stereo_msgs/stereo_msgs-1.12.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages specific to stereo processing, such as disparity images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_msgs/stereo_msgs-1.12.4.ebuild b/dev-ros/stereo_msgs/stereo_msgs-1.12.4.ebuild
deleted file mode 100644
index e52d3c2cb983..000000000000
--- a/dev-ros/stereo_msgs/stereo_msgs-1.12.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages specific to stereo processing, such as disparity images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_msgs/stereo_msgs-1.12.5.ebuild b/dev-ros/stereo_msgs/stereo_msgs-1.12.5.ebuild
deleted file mode 100644
index e52d3c2cb983..000000000000
--- a/dev-ros/stereo_msgs/stereo_msgs-1.12.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages specific to stereo processing, such as disparity images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_msgs/stereo_msgs-1.12.6.ebuild b/dev-ros/stereo_msgs/stereo_msgs-1.12.6.ebuild
deleted file mode 100644
index e52d3c2cb983..000000000000
--- a/dev-ros/stereo_msgs/stereo_msgs-1.12.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages specific to stereo processing, such as disparity images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_msgs/stereo_msgs-1.12.7.ebuild b/dev-ros/stereo_msgs/stereo_msgs-1.12.7.ebuild
deleted file mode 100644
index e52d3c2cb983..000000000000
--- a/dev-ros/stereo_msgs/stereo_msgs-1.12.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages specific to stereo processing, such as disparity images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_msgs/stereo_msgs-1.13.0.ebuild b/dev-ros/stereo_msgs/stereo_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..1154173356b6
--- /dev/null
+++ b/dev-ros/stereo_msgs/stereo_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages specific to stereo processing, such as disparity images"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_msgs/stereo_msgs-9999.ebuild b/dev-ros/stereo_msgs/stereo_msgs-9999.ebuild
index e52d3c2cb983..1154173356b6 100644
--- a/dev-ros/stereo_msgs/stereo_msgs-9999.ebuild
+++ b/dev-ros/stereo_msgs/stereo_msgs-9999.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/common_msgs"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
diff --git a/dev-ros/test_bond/Manifest b/dev-ros/test_bond/Manifest
index eaee437ba457..5f72e699e2f3 100644
--- a/dev-ros/test_bond/Manifest
+++ b/dev-ros/test_bond/Manifest
@@ -1,12 +1,4 @@
-DIST bond_core-1.7.19.tar.gz 31455 BLAKE2B 86b21d44624c0be8c9445b53d46541785d47fe36366e1d25305a689faa99577905730cd313b7789302ebc6677f85c361d8c51a523233ade11bd6b493ee986dd2 SHA512 63584fa465dba48def1c049e713b0438ea6dd15bd968ee5a1ef969e21540d2693eb61bffb40134dd28486c83c6e54d8db9c71af8f2949bd38a3f7c63be5b65fb
-DIST bond_core-1.8.0.tar.gz 32199 BLAKE2B 8b5f308c3ff4ee3cf4d969ffa7cc05433ab0b992865a782b9c63d8b27615a158fe1885302703aa357f486ea4409e9e07aa3b43bbef6d41fbd127a8bc2c7252cc SHA512 5519d5366d94403862f34ff16e06ead099a164e43987a113c5ec3d62a8d32430b81fc3bee557513dac05ce6bdb39e6bc3c1a3477573de74610217ea92d373526
-DIST bond_core-1.8.1.tar.gz 32283 BLAKE2B d9d99891507106bff4f4ef7beb80ef878c9ddbbbcb073ea5bbeba11c0d21a7f94dc12a9fc3daea26c4f7585c991bb6283244af8852cee47162185136e0a2d694 SHA512 767d47d7d69bf2a1e6ce5d403f1e0f248c9414998a077f9a0815976975c6ed071eb0338543b9947285b30f5135e410fc273ad4243e5478819286a96e94f4584c
-DIST bond_core-1.8.2.tar.gz 32541 BLAKE2B d2c3000dcd92399f8349f9fbcffbfb432f6f98128365296071ce478c41e9754def757ab26cc89a7e00a0c503ae037792cf494ab53a315fe95de9a56803b2d1ab SHA512 6cb0d5f7af42d1e558772a06ec62a8f31ec8716c72c4d04927301b222de0a67df246e288e777d2ebc9c78000d3bd0c4efe494ea184beb3c906343e83e443c844
-DIST bond_core-1.8.3.tar.gz 32831 BLAKE2B d0c71488436340eff92930006d995ecdd0e98248606b3a6588b36a057584ccc325f751cc170443d21212138bfca2d34c47bd88d4a8a0b719cce81de7bab3218f SHA512 9f9bb71b431199582a36da6ec53806f25fd28fcdfe42e34d60a759f07de98ec86e3f156bc95dc218f3c517e66be426fc30510e111ade9459dfefd74a9555943a
-EBUILD test_bond-1.7.19.ebuild 501 BLAKE2B 01e191ed44b134747afdd317cf7088ee64bff403d164d96f37a9fd74dc1b9223f949978db7bee74a95eec692b500a8ef73ecf87806b850432662a956ddef3463 SHA512 720f2ccd6319db2dced55a83d8786517c89bafa84beaee49a91ed188403c07a454030c620ff47d9db906c6f6393608f66f1dba788ba0aafa68a20aa4341e4056
-EBUILD test_bond-1.8.0.ebuild 501 BLAKE2B 01e191ed44b134747afdd317cf7088ee64bff403d164d96f37a9fd74dc1b9223f949978db7bee74a95eec692b500a8ef73ecf87806b850432662a956ddef3463 SHA512 720f2ccd6319db2dced55a83d8786517c89bafa84beaee49a91ed188403c07a454030c620ff47d9db906c6f6393608f66f1dba788ba0aafa68a20aa4341e4056
-EBUILD test_bond-1.8.1.ebuild 501 BLAKE2B 01e191ed44b134747afdd317cf7088ee64bff403d164d96f37a9fd74dc1b9223f949978db7bee74a95eec692b500a8ef73ecf87806b850432662a956ddef3463 SHA512 720f2ccd6319db2dced55a83d8786517c89bafa84beaee49a91ed188403c07a454030c620ff47d9db906c6f6393608f66f1dba788ba0aafa68a20aa4341e4056
-EBUILD test_bond-1.8.2.ebuild 501 BLAKE2B 8124fe0307809de6db388ee411f1304c308e2472e5e63dc37f5daf76faf43b6b910ce9297a5bdb831ac6be99ff0499ec0fa4d2140d261e38cd89355aae2bcb77 SHA512 7fd9dec1d65db88bf8f5a2faf6cfe5b6f58301a5963928b98f7208e4f62b328079c4a44dfc433d70610428d3fe71765d70f16b4ffcf43c5558b8981bc0d81643
-EBUILD test_bond-1.8.3.ebuild 501 BLAKE2B 8124fe0307809de6db388ee411f1304c308e2472e5e63dc37f5daf76faf43b6b910ce9297a5bdb831ac6be99ff0499ec0fa4d2140d261e38cd89355aae2bcb77 SHA512 7fd9dec1d65db88bf8f5a2faf6cfe5b6f58301a5963928b98f7208e4f62b328079c4a44dfc433d70610428d3fe71765d70f16b4ffcf43c5558b8981bc0d81643
-EBUILD test_bond-9999.ebuild 501 BLAKE2B 01e191ed44b134747afdd317cf7088ee64bff403d164d96f37a9fd74dc1b9223f949978db7bee74a95eec692b500a8ef73ecf87806b850432662a956ddef3463 SHA512 720f2ccd6319db2dced55a83d8786517c89bafa84beaee49a91ed188403c07a454030c620ff47d9db906c6f6393608f66f1dba788ba0aafa68a20aa4341e4056
+DIST bond_core-1.8.5.tar.gz 33713 BLAKE2B c18d77ac0d8ccf717dc5eba28ae560d4ce07aa7e4b077be5c38f46bccfe5b9fc218f47b72a553605e6c25d2b79e15decfceab5ce8ad8b211c6b1a91ab05cf7ba SHA512 544c0abc2e77debc984fdf6941b8f44b2a77b37ee50b4fd27418a296e8c489f445285358e32cc723d47a75bf0e289c9d49133a096efdbed26a0a058f3ea06609
+EBUILD test_bond-1.8.5.ebuild 470 BLAKE2B 7bcb6c1fd8fd33a4ecd4359fc22e06b0255c4dfcb15a7aea37daacb12797a0c1497b07437d5109dd7042bfeeecb14e8b9f6c6c4abafff80a83c94c621bbed993 SHA512 138e44dad6342d3fc858439ed179221783b15f895e3150229027605159f7efe6979b9300ef661886a1266ad32694edea11e54767abeab6cae2a49e387f58be51
+EBUILD test_bond-9999.ebuild 470 BLAKE2B 7bcb6c1fd8fd33a4ecd4359fc22e06b0255c4dfcb15a7aea37daacb12797a0c1497b07437d5109dd7042bfeeecb14e8b9f6c6c4abafff80a83c94c621bbed993 SHA512 138e44dad6342d3fc858439ed179221783b15f895e3150229027605159f7efe6979b9300ef661886a1266ad32694edea11e54767abeab6cae2a49e387f58be51
MISC metadata.xml 327 BLAKE2B e092eb0166dfaa1b0621bf8b428daa6d4d3ad9c5508865753ac6b8a7154c060d4328b695addd27d82aa2fe6dbfd2c3b9b1bfff3ae8f15d4f4a72e06952b1de15 SHA512 08675ab2448c90d64ccdc426a04ba319caa4be4291b8f5ede6b077ccecbf14aee898975525d12c9d0c97597b4d91be36e9ddfad18c5a5e4b072a58c0833828d3
diff --git a/dev-ros/test_bond/test_bond-1.7.19.ebuild b/dev-ros/test_bond/test_bond-1.7.19.ebuild
deleted file mode 100644
index f016538e397b..000000000000
--- a/dev-ros/test_bond/test_bond-1.7.19.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for bond, bondpy and bondcpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bondcpp
- dev-ros/bondpy[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/test_bond/test_bond-1.8.0.ebuild b/dev-ros/test_bond/test_bond-1.8.0.ebuild
deleted file mode 100644
index f016538e397b..000000000000
--- a/dev-ros/test_bond/test_bond-1.8.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for bond, bondpy and bondcpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bondcpp
- dev-ros/bondpy[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/test_bond/test_bond-1.8.1.ebuild b/dev-ros/test_bond/test_bond-1.8.1.ebuild
deleted file mode 100644
index f016538e397b..000000000000
--- a/dev-ros/test_bond/test_bond-1.8.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for bond, bondpy and bondcpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bondcpp
- dev-ros/bondpy[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/test_bond/test_bond-1.8.2.ebuild b/dev-ros/test_bond/test_bond-1.8.2.ebuild
deleted file mode 100644
index 0853d20f14d8..000000000000
--- a/dev-ros/test_bond/test_bond-1.8.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for bond, bondpy and bondcpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bondcpp
- dev-ros/bondpy[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/test_bond/test_bond-1.8.3.ebuild b/dev-ros/test_bond/test_bond-1.8.3.ebuild
deleted file mode 100644
index 0853d20f14d8..000000000000
--- a/dev-ros/test_bond/test_bond-1.8.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for bond, bondpy and bondcpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/bondcpp
- dev-ros/bondpy[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/test_bond/test_bond-1.8.5.ebuild b/dev-ros/test_bond/test_bond-1.8.5.ebuild
new file mode 100644
index 000000000000..87a4b2e5a374
--- /dev/null
+++ b/dev-ros/test_bond/test_bond-1.8.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/bond_core"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tests for bond, bondpy and bondcpp"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/bondcpp
+ dev-ros/bondpy[${PYTHON_USEDEP}]
+ dev-ros/rostest[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/test_bond/test_bond-9999.ebuild b/dev-ros/test_bond/test_bond-9999.ebuild
index f016538e397b..87a4b2e5a374 100644
--- a/dev-ros/test_bond/test_bond-9999.ebuild
+++ b/dev-ros/test_bond/test_bond-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/bond_core"
KEYWORDS="~amd64 ~arm"
CATKIN_HAS_MESSAGES=yes
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/test_diagnostic_aggregator/Manifest b/dev-ros/test_diagnostic_aggregator/Manifest
index 65c34990c7c5..e19ef3e15284 100644
--- a/dev-ros/test_diagnostic_aggregator/Manifest
+++ b/dev-ros/test_diagnostic_aggregator/Manifest
@@ -1,5 +1,5 @@
AUX gcc6.patch 487 BLAKE2B 9301c9e8e22bb780ea2d91a0055fc0f2f03af1ce3fefeb3bf8c5d53d544f1b73b5420a3cf510c6adc71a615ddfea2894c9ff1fbc4655a403b5b599753a25727e SHA512 20b0cf8ed7774493fa0626fd89932368d6bcbb50e4719cbd29c58012d5bd60357392984959452f8ba12266c54cbd8d825d972de2a3f46f067bda164868d32f86
-DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
-EBUILD test_diagnostic_aggregator-1.9.3.ebuild 492 BLAKE2B e8945f4e168fe32a7410c274dd196039445a8d8755bb6f1199371f011ce89e251eec7e6270767e5b083ea1271127a907620a3fd5b035cc60029f299b2136f291 SHA512 f93e6e1110111f3c3b1dfcc322bb0ed1c895dec96fb837075be6b09a1b4220d7de411c00a284293c45cc8e57d335239db0e9d54cb2e26b17a808190aa09c3b63
-EBUILD test_diagnostic_aggregator-9999.ebuild 492 BLAKE2B e8945f4e168fe32a7410c274dd196039445a8d8755bb6f1199371f011ce89e251eec7e6270767e5b083ea1271127a907620a3fd5b035cc60029f299b2136f291 SHA512 f93e6e1110111f3c3b1dfcc322bb0ed1c895dec96fb837075be6b09a1b4220d7de411c00a284293c45cc8e57d335239db0e9d54cb2e26b17a808190aa09c3b63
+DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
+EBUILD test_diagnostic_aggregator-1.9.4.ebuild 489 BLAKE2B e0492080a54d531942b14f318c51c8ed208696ca53862db5096344f383c8a653ed375ff3f26df54675000cf68a009e481e2b83b7552e709483854d6dd3ebace5 SHA512 ac21e5d3f950854906d9cfc6bef20e530b8a17750c82852711ad00ab40f6881edb2c31626bc56316e4e24e6e52054eac2cf9b7c53873b4941c496241d69fcd6a
+EBUILD test_diagnostic_aggregator-9999.ebuild 489 BLAKE2B e0492080a54d531942b14f318c51c8ed208696ca53862db5096344f383c8a653ed375ff3f26df54675000cf68a009e481e2b83b7552e709483854d6dd3ebace5 SHA512 ac21e5d3f950854906d9cfc6bef20e530b8a17750c82852711ad00ab40f6881edb2c31626bc56316e4e24e6e52054eac2cf9b7c53873b4941c496241d69fcd6a
MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.3.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.3.ebuild
deleted file mode 100644
index cabd94dbe35a..000000000000
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="diagnostic_aggregator tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/diagnostic_aggregator
- dev-ros/diagnostic_msgs
- dev-ros/pluginlib
- dev-ros/roscpp
- dev-ros/rospy
- dev-ros/rostest
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.4.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.4.ebuild
new file mode 100644
index 000000000000..5fe90378f6ec
--- /dev/null
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="diagnostic_aggregator tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/diagnostic_aggregator
+ dev-ros/diagnostic_msgs
+ dev-ros/pluginlib
+ dev-ros/roscpp
+ dev-ros/rospy
+ dev-ros/rostest
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild
index cabd94dbe35a..5fe90378f6ec 100644
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/diagnostics"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
diff --git a/dev-ros/test_nodelet/Manifest b/dev-ros/test_nodelet/Manifest
index 3adf5fc31c3b..e6099a11664c 100644
--- a/dev-ros/test_nodelet/Manifest
+++ b/dev-ros/test_nodelet/Manifest
@@ -1,5 +1,5 @@
AUX gcc6.patch 487 BLAKE2B 30f0092f37d10831053ac74ecabf13d591e4da145772e4b42b352bc9d7299f013737b64ab8f88145100d6490f5a7b3041780d11dc45fea62ae4264be05ceec43 SHA512 1258e607c9fdd0a645e3396186408be7628ba53b6b1994a00552be48b65b413038818cb414ccf521c404a80373094059d0478f859540dff23141f14b50cfaeb3
-DIST nodelet_core-1.9.16.tar.gz 44194 BLAKE2B e174ae42d7a6e91f20dee25c8740f0c339b660040d11e2231a350b1f0ca4f37ab48e1811f0aa66a8365f3c280e4ba923aa7f0a2e0997400b2b8ea1775d6fa780 SHA512 36408735028e6034f551e331da8379f5d9dd37128f749830cd5654298fc02c3fdc609e82cdb314cefcb06bd6d36eb6b37f6efa468487ee8068a4da6d0b8c1787
-EBUILD test_nodelet-1.9.16.ebuild 504 BLAKE2B 65eabdd094e840c726088dee8b949b2f0d8a79f3f53acaebcf85996c3baadaae5c9387094bd6bf04a0d5eecdcec2a56bbda0b78b18e86b5a108525759c7c52d6 SHA512 a0d0ebad0beec555f3473af4b09c9f7883da40f1e548590498313883cf8d122bf8e89ca0a68752a08f405bd53610ebbc5f6f91696523685aa13858dd7515993d
-EBUILD test_nodelet-9999.ebuild 504 BLAKE2B cf186f4ec5d269d59c3733f0234e9ffb28d2a57397ed8b8dc58378addb8ce0765eab20a883a8f9c1662abb101af6380f879b107c30748034ede5a662fc3d073f SHA512 9d041b275321de71de748d6d4961e71fe2831024609f7d0005279d542ba8d9750737341b120fac34e8f3b13111814f76b02a7cdb3068531f84616bfee8405299
+DIST nodelet_core-1.10.0.tar.gz 45386 BLAKE2B 1da08ec8bc134e0eba72d7c0cde7cfd351c91c5bf4bc8d66ad3d30a8dbe39452c511b6a753ea91a139ce06b617d71f06cfb2f67c7ee2482eb5d2aba79680799c SHA512 4a298cc214660050b7a4d4f3a1e8980cbde2d05bb19369856031a128d3ca7518cbbd4615fe8c0c5944b09dca96aeaa8f41a630b2f34f9e2af423349e816c54e9
+EBUILD test_nodelet-1.10.0.ebuild 501 BLAKE2B f13999a9ecea30d3013ebd6f056565b051a53546b2e0377f9def9bf6731ae27b8e8dae0a871e2c147d82555bb17e9ea0559404e88921d3985a61518b3a7a9fcb SHA512 4941abd24ce6c3651b7bf180fcf9f72c416476802293e8892621c7b874ed9ac7817a04892d09a578f92b7a85fafe9dedaf5459baa6753303c6b439db1db07c42
+EBUILD test_nodelet-9999.ebuild 501 BLAKE2B f13999a9ecea30d3013ebd6f056565b051a53546b2e0377f9def9bf6731ae27b8e8dae0a871e2c147d82555bb17e9ea0559404e88921d3985a61518b3a7a9fcb SHA512 4941abd24ce6c3651b7bf180fcf9f72c416476802293e8892621c7b874ed9ac7817a04892d09a578f92b7a85fafe9dedaf5459baa6753303c6b439db1db07c42
MISC metadata.xml 330 BLAKE2B 7f8d8593aa2f28cd25f2c1a7d21fce8f09b3f97ff1fe72bbe532c3f1f3da5ef3c4611c7318ee3638a0e7591a01881ee517b1a484fe5182904d7f3849ebe697a0 SHA512 d1fd92493c64f5d10c309bdf2e9bcfb9faac89cecd7937ef9876a469f4440c5bfa8fec93b316e47a68e68cd44d465be52a7c2a345e2075679dc7045572e9c266
diff --git a/dev-ros/test_nodelet/test_nodelet-1.10.0.ebuild b/dev-ros/test_nodelet/test_nodelet-1.10.0.ebuild
new file mode 100644
index 000000000000..0f7a330d3056
--- /dev/null
+++ b/dev-ros/test_nodelet/test_nodelet-1.10.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/nodelet_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Nodelet unit tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ test? (
+ dev-ros/nodelet
+ dev-ros/pluginlib
+ dev-ros/rostest
+ dev-libs/boost
+ dev-cpp/gtest
+ dev-ros/rosbash
+ )
+"
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/test_nodelet/test_nodelet-1.9.16.ebuild b/dev-ros/test_nodelet/test_nodelet-1.9.16.ebuild
deleted file mode 100644
index 862a47a4e0af..000000000000
--- a/dev-ros/test_nodelet/test_nodelet-1.9.16.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelet unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? (
- dev-ros/nodelet
- dev-ros/pluginlib
- dev-ros/rostest
- dev-libs/boost
- dev-cpp/gtest
- dev-ros/rosbash
- )
-"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/test_nodelet/test_nodelet-9999.ebuild b/dev-ros/test_nodelet/test_nodelet-9999.ebuild
index 417f82f9839e..0f7a330d3056 100644
--- a/dev-ros/test_nodelet/test_nodelet-9999.ebuild
+++ b/dev-ros/test_nodelet/test_nodelet-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/nodelet_core"
KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/test_nodelet_topic_tools/Manifest b/dev-ros/test_nodelet_topic_tools/Manifest
index cc23b002d0cc..364f6a9c2d9a 100644
--- a/dev-ros/test_nodelet_topic_tools/Manifest
+++ b/dev-ros/test_nodelet_topic_tools/Manifest
@@ -1,4 +1,4 @@
-DIST nodelet_core-1.9.16.tar.gz 44194 BLAKE2B e174ae42d7a6e91f20dee25c8740f0c339b660040d11e2231a350b1f0ca4f37ab48e1811f0aa66a8365f3c280e4ba923aa7f0a2e0997400b2b8ea1775d6fa780 SHA512 36408735028e6034f551e331da8379f5d9dd37128f749830cd5654298fc02c3fdc609e82cdb314cefcb06bd6d36eb6b37f6efa468487ee8068a4da6d0b8c1787
-EBUILD test_nodelet_topic_tools-1.9.16.ebuild 483 BLAKE2B 4342a75139f1b8a1a63e75ebeb28a83f96cc6365b8e5154d029cb822d3c4501f1b83924168ee6097a33500d3aaeac87868982e64efbca0beaad726386f17093a SHA512 3aa3b01464f484c451aa4c89be3625941639a7bd880a5338242b071c8cfec57ff5d16b3092eba4cbe0bfc8fb870c0c91ddc2206582d8d3da351087b0c0c04be4
-EBUILD test_nodelet_topic_tools-9999.ebuild 483 BLAKE2B 986b83f9ab8950fa96dc16915f752f5054932c006c1d6ff2ea4edfdfc6d1755bbac58c47f47e382ffdb303b5226df005ba22080b52ae38384617c4851ffd5753 SHA512 76e71767e26ac4bae271ab0e3ac8604beaabab9b7a915fe5fac66dcc96b36f7a27c981e30577846d85c6f75324494cc9b7846c8e0fd7a70b0940f0cee91be1ed
+DIST nodelet_core-1.10.0.tar.gz 45386 BLAKE2B 1da08ec8bc134e0eba72d7c0cde7cfd351c91c5bf4bc8d66ad3d30a8dbe39452c511b6a753ea91a139ce06b617d71f06cfb2f67c7ee2482eb5d2aba79680799c SHA512 4a298cc214660050b7a4d4f3a1e8980cbde2d05bb19369856031a128d3ca7518cbbd4615fe8c0c5944b09dca96aeaa8f41a630b2f34f9e2af423349e816c54e9
+EBUILD test_nodelet_topic_tools-1.10.0.ebuild 480 BLAKE2B 9db7dc679c61a681988a13ca9aa310f3ef2631acc4f46a3d84361781ff5f8cbaff67cfdb0f1a753c093489d145dd5fe66de50f1756a47f72972dc0ba5f11a779 SHA512 56be1058f28e4b48efce546dbb78dc840769da434a290f6da45f828e49587486c8fb6d73ca509fbed4fc162fe9311ae0b713f1ef8bc26eab731a2e995ef69858
+EBUILD test_nodelet_topic_tools-9999.ebuild 480 BLAKE2B 9db7dc679c61a681988a13ca9aa310f3ef2631acc4f46a3d84361781ff5f8cbaff67cfdb0f1a753c093489d145dd5fe66de50f1756a47f72972dc0ba5f11a779 SHA512 56be1058f28e4b48efce546dbb78dc840769da434a290f6da45f828e49587486c8fb6d73ca509fbed4fc162fe9311ae0b713f1ef8bc26eab731a2e995ef69858
MISC metadata.xml 330 BLAKE2B 7f8d8593aa2f28cd25f2c1a7d21fce8f09b3f97ff1fe72bbe532c3f1f3da5ef3c4611c7318ee3638a0e7591a01881ee517b1a484fe5182904d7f3849ebe697a0 SHA512 d1fd92493c64f5d10c309bdf2e9bcfb9faac89cecd7937ef9876a469f4440c5bfa8fec93b316e47a68e68cd44d465be52a7c2a345e2075679dc7045572e9c266
diff --git a/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.10.0.ebuild b/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.10.0.ebuild
new file mode 100644
index 000000000000..cd5963a62b21
--- /dev/null
+++ b/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.10.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/nodelet_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Nodelet topic tools unit tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/message_filters
+ dev-ros/nodelet
+ dev-ros/nodelet_topic_tools
+ dev-ros/pluginlib
+ dev-ros/roscpp
+ dev-ros/rostest
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.9.16.ebuild b/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.9.16.ebuild
deleted file mode 100644
index d482731b49c0..000000000000
--- a/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.9.16.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelet topic tools unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/message_filters
- dev-ros/nodelet
- dev-ros/nodelet_topic_tools
- dev-ros/pluginlib
- dev-ros/roscpp
- dev-ros/rostest
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-9999.ebuild b/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-9999.ebuild
index ac166713248f..cd5963a62b21 100644
--- a/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-9999.ebuild
+++ b/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/nodelet_core"
KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/test_rosbag/Manifest b/dev-ros/test_rosbag/Manifest
index 64167379a716..d65c9225c459 100644
--- a/dev-ros/test_rosbag/Manifest
+++ b/dev-ros/test_rosbag/Manifest
@@ -1,20 +1,4 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_rosbag-1.13.0.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
-EBUILD test_rosbag-1.13.1.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
-EBUILD test_rosbag-1.13.2.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
-EBUILD test_rosbag-1.13.4.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
-EBUILD test_rosbag-1.13.5.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
-EBUILD test_rosbag-1.13.6.ebuild 840 BLAKE2B 9f1886a266e904b42f948de75eb4befb12b589248050ae75bcda3ff682d8248ded8e601e6113af84f30e42ab5b024b1a90b96af0f18d46f4dcf822a03561766c SHA512 c3a56c11dc788d45ed76b1e151312c3db2832c391581a18a6ed7e67a72702fdb8454255b7c4be2c85a0a67bb8ad37fd0155ffcec56d61e746b5347e7f05e809f
-EBUILD test_rosbag-1.14.2.ebuild 840 BLAKE2B 9f1886a266e904b42f948de75eb4befb12b589248050ae75bcda3ff682d8248ded8e601e6113af84f30e42ab5b024b1a90b96af0f18d46f4dcf822a03561766c SHA512 c3a56c11dc788d45ed76b1e151312c3db2832c391581a18a6ed7e67a72702fdb8454255b7c4be2c85a0a67bb8ad37fd0155ffcec56d61e746b5347e7f05e809f
-EBUILD test_rosbag-1.14.3.ebuild 840 BLAKE2B 9f1886a266e904b42f948de75eb4befb12b589248050ae75bcda3ff682d8248ded8e601e6113af84f30e42ab5b024b1a90b96af0f18d46f4dcf822a03561766c SHA512 c3a56c11dc788d45ed76b1e151312c3db2832c391581a18a6ed7e67a72702fdb8454255b7c4be2c85a0a67bb8ad37fd0155ffcec56d61e746b5347e7f05e809f
-EBUILD test_rosbag-1.15.4.ebuild 837 BLAKE2B b90afd9f723ff6e4d1be048aac2cdedb5cb32d24b060d29085dea31dda9b0d892d7a5b009fac78f56a89b5c426716fe890158841f549cbef1de85380583b7208 SHA512 8d006d83727ffc89945962a2b1e549028417a3caa20ab47b6e530d3b9adb188c3814986fd72b333d20fc0ee819b7e0e91f69e71a814f6f1c24315eae5a7bb101
-EBUILD test_rosbag-9999.ebuild 840 BLAKE2B 4ea77fe53b2287de2f68558340968b0833871953aea2008574e1f85395ce8c35d7169c612fff9f66579119aa1f80f42d5a10806b3321fd0edd9fff7795b4f5f8 SHA512 f094d1f6268deb2b18ca04e0d1098eccb889e9e40337f947392a36c603b2ffd111cb0968187e2ceb8aa77f7dec772c00f0d5d1660ff3e1b85476c5939a33e6ba
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD test_rosbag-1.15.7.ebuild 809 BLAKE2B d7ef10a2dd1fed9533aedbb251344d312ef1c15daabf58a7a5e8c446713187ba91a4e5cbd0d53e9f8d2e222bc95ec2d110ec920c35f73fb4a42658a97eaf6eb9 SHA512 ea9d79be398d4dc15abac57d00d05c7d4ddccb515ae87b32fdb45864a14ad5ce3c83c28bc84e651ec674d741c5833712be8c96db1ca99404bb73f3f2cec46661
+EBUILD test_rosbag-9999.ebuild 809 BLAKE2B d7ef10a2dd1fed9533aedbb251344d312ef1c15daabf58a7a5e8c446713187ba91a4e5cbd0d53e9f8d2e222bc95ec2d110ec920c35f73fb4a42658a97eaf6eb9 SHA512 ea9d79be398d4dc15abac57d00d05c7d4ddccb515ae87b32fdb45864a14ad5ce3c83c28bc84e651ec674d741c5833712be8c96db1ca99404bb73f3f2cec46661
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosbag/test_rosbag-1.13.0.ebuild b/dev-ros/test_rosbag/test_rosbag-1.13.0.ebuild
deleted file mode 100644
index 81cdc86fbdf5..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.13.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/message_generation
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-ros/topic_tools[${PYTHON_USEDEP}]
- dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
- test? (
- dev-libs/boost[threads]
- app-arch/bzip2
- dev-ros/rosout
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-cpp/gtest
- )
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.13.1.ebuild b/dev-ros/test_rosbag/test_rosbag-1.13.1.ebuild
deleted file mode 100644
index 81cdc86fbdf5..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.13.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/message_generation
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-ros/topic_tools[${PYTHON_USEDEP}]
- dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
- test? (
- dev-libs/boost[threads]
- app-arch/bzip2
- dev-ros/rosout
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-cpp/gtest
- )
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.13.2.ebuild b/dev-ros/test_rosbag/test_rosbag-1.13.2.ebuild
deleted file mode 100644
index 81cdc86fbdf5..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.13.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/message_generation
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-ros/topic_tools[${PYTHON_USEDEP}]
- dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
- test? (
- dev-libs/boost[threads]
- app-arch/bzip2
- dev-ros/rosout
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-cpp/gtest
- )
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.13.4.ebuild b/dev-ros/test_rosbag/test_rosbag-1.13.4.ebuild
deleted file mode 100644
index 81cdc86fbdf5..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.13.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/message_generation
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-ros/topic_tools[${PYTHON_USEDEP}]
- dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
- test? (
- dev-libs/boost[threads]
- app-arch/bzip2
- dev-ros/rosout
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-cpp/gtest
- )
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.13.5.ebuild b/dev-ros/test_rosbag/test_rosbag-1.13.5.ebuild
deleted file mode 100644
index 81cdc86fbdf5..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.13.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/message_generation
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-ros/topic_tools[${PYTHON_USEDEP}]
- dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
- test? (
- dev-libs/boost[threads]
- app-arch/bzip2
- dev-ros/rosout
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-cpp/gtest
- )
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.13.6.ebuild b/dev-ros/test_rosbag/test_rosbag-1.13.6.ebuild
deleted file mode 100644
index e1c884997333..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.13.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/message_generation
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-ros/topic_tools[${PYTHON_USEDEP}]
- dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
- test? (
- dev-libs/boost[threads]
- app-arch/bzip2
- dev-ros/rosout
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-cpp/gtest
- )
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.14.2.ebuild b/dev-ros/test_rosbag/test_rosbag-1.14.2.ebuild
deleted file mode 100644
index e1c884997333..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.14.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/message_generation
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-ros/topic_tools[${PYTHON_USEDEP}]
- dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
- test? (
- dev-libs/boost[threads]
- app-arch/bzip2
- dev-ros/rosout
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-cpp/gtest
- )
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.14.3.ebuild b/dev-ros/test_rosbag/test_rosbag-1.14.3.ebuild
deleted file mode 100644
index e1c884997333..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.14.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/message_generation
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-ros/topic_tools[${PYTHON_USEDEP}]
- dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
- test? (
- dev-libs/boost[threads]
- app-arch/bzip2
- dev-ros/rosout
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-cpp/gtest
- )
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.15.4.ebuild b/dev-ros/test_rosbag/test_rosbag-1.15.4.ebuild
deleted file mode 100644
index 9d9775c4523e..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.15.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/message_generation
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-ros/topic_tools[${PYTHON_USEDEP}]
- dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
- test? (
- dev-libs/boost[threads]
- app-arch/bzip2
- dev-ros/rosout
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-cpp/gtest
- )
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.15.7.ebuild b/dev-ros/test_rosbag/test_rosbag-1.15.7.ebuild
new file mode 100644
index 000000000000..d46919e137c9
--- /dev/null
+++ b/dev-ros/test_rosbag/test_rosbag-1.15.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/message_generation
+ dev-ros/rosbag[${PYTHON_USEDEP}]
+ dev-ros/rosconsole
+ dev-ros/roscpp
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-ros/rosunit[${PYTHON_USEDEP}]
+ dev-ros/topic_tools[${PYTHON_USEDEP}]
+ dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-libs/boost[threads]
+ app-arch/bzip2
+ dev-ros/rosout
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-cpp/gtest
+ )
+"
diff --git a/dev-ros/test_rosbag/test_rosbag-9999.ebuild b/dev-ros/test_rosbag/test_rosbag-9999.ebuild
index 09da85f90f2f..d46919e137c9 100644
--- a/dev-ros/test_rosbag/test_rosbag-9999.ebuild
+++ b/dev-ros/test_rosbag/test_rosbag-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
CATKIN_HAS_MESSAGES=yes
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
diff --git a/dev-ros/test_rosbag_storage/Manifest b/dev-ros/test_rosbag_storage/Manifest
index 2969f93bc036..78e89285118e 100644
--- a/dev-ros/test_rosbag_storage/Manifest
+++ b/dev-ros/test_rosbag_storage/Manifest
@@ -1,20 +1,4 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_rosbag_storage-1.13.0.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
-EBUILD test_rosbag_storage-1.13.1.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
-EBUILD test_rosbag_storage-1.13.2.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
-EBUILD test_rosbag_storage-1.13.4.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
-EBUILD test_rosbag_storage-1.13.5.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
-EBUILD test_rosbag_storage-1.13.6.ebuild 452 BLAKE2B 2769e5d28c34b7102298c3d0f98d660baa870c59a7299be038029e6ce3636489b3d02a16d954dd9779fb635917ad134408ef5205cc62c8ea6dd43b9e98f408a3 SHA512 deff131d08cdead605916e1af61fd5aabdbe2f70479075272a9ec78202686638377d72c27fbbe2561d18452b950682ae7a2e0042bb4d6766c58715ce047e9830
-EBUILD test_rosbag_storage-1.14.2.ebuild 452 BLAKE2B 2769e5d28c34b7102298c3d0f98d660baa870c59a7299be038029e6ce3636489b3d02a16d954dd9779fb635917ad134408ef5205cc62c8ea6dd43b9e98f408a3 SHA512 deff131d08cdead605916e1af61fd5aabdbe2f70479075272a9ec78202686638377d72c27fbbe2561d18452b950682ae7a2e0042bb4d6766c58715ce047e9830
-EBUILD test_rosbag_storage-1.14.3.ebuild 452 BLAKE2B 2769e5d28c34b7102298c3d0f98d660baa870c59a7299be038029e6ce3636489b3d02a16d954dd9779fb635917ad134408ef5205cc62c8ea6dd43b9e98f408a3 SHA512 deff131d08cdead605916e1af61fd5aabdbe2f70479075272a9ec78202686638377d72c27fbbe2561d18452b950682ae7a2e0042bb4d6766c58715ce047e9830
-EBUILD test_rosbag_storage-1.15.4.ebuild 449 BLAKE2B 4b94b391be588c89ac4f24e0939631d7ccad33effd2d60db1718731c6fe6f21c66b0437092700fd8db0a3a64c8c810c81e03e23579894530e5d66af65e0256b4 SHA512 e0a5f4d95e37c39889d853d663304c579f2f57503a6ff18dc1d2fce483b14246af3938b2fae68ebcd73260f0c62ac0444fb5a6a32c1bb0f358abfbb169a2f88e
-EBUILD test_rosbag_storage-9999.ebuild 452 BLAKE2B 77d6739d14ac2a65205f3fb708f2876a5ac77cb1d5dd398d77418ad90295a431c0184711d6bba55780c8249690fd870170b2bf492134c88879ab8b71ce6ef643 SHA512 5da1d0e29a39475966df57aa6f820e053b3cd4873d9ce88803956c52fd3a3a14773b618c57a5621831cc5b505380658c4881a23fe16a656f0f3ba1215b9a07e8
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD test_rosbag_storage-1.15.7.ebuild 449 BLAKE2B 211dd15ae3eb1f7aac8829f7e43c60a87f2c0a9fb16deca301ebee0450171d551606cc69264eb0cf7e6ad8453a3d13815b5b29873efb600c3bea51b6eb7f8fd6 SHA512 6e599f7da72c39133a6017fd21c76833a9dde42876839133eefc641362e8c03a18f47c2e3c3c0a7b48cc49f313891fdd6f04fe69c8a11e4642efd8be3fc6805b
+EBUILD test_rosbag_storage-9999.ebuild 449 BLAKE2B 211dd15ae3eb1f7aac8829f7e43c60a87f2c0a9fb16deca301ebee0450171d551606cc69264eb0cf7e6ad8453a3d13815b5b29873efb600c3bea51b6eb7f8fd6 SHA512 6e599f7da72c39133a6017fd21c76833a9dde42876839133eefc641362e8c03a18f47c2e3c3c0a7b48cc49f313891fdd6f04fe69c8a11e4642efd8be3fc6805b
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.0.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.0.ebuild
deleted file mode 100644
index a722298546d1..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rosbag_storage
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.1.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.1.ebuild
deleted file mode 100644
index a722298546d1..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rosbag_storage
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.2.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.2.ebuild
deleted file mode 100644
index a722298546d1..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rosbag_storage
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.4.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.4.ebuild
deleted file mode 100644
index a722298546d1..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rosbag_storage
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.5.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.5.ebuild
deleted file mode 100644
index a722298546d1..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rosbag_storage
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.6.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.6.ebuild
deleted file mode 100644
index 31f2c38f62c9..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rosbag_storage
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.14.2.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.14.2.ebuild
deleted file mode 100644
index 31f2c38f62c9..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.14.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rosbag_storage
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.14.3.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.14.3.ebuild
deleted file mode 100644
index 31f2c38f62c9..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.14.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rosbag_storage
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.4.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.4.ebuild
deleted file mode 100644
index 8f9c485914bb..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rosbag_storage
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.7.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.7.ebuild
new file mode 100644
index 000000000000..9b630af5d5f8
--- /dev/null
+++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag_storage"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-ros/rosbag_storage
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-libs/boost:=
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-9999.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-9999.ebuild
index d2c8c31a7a75..9b630af5d5f8 100644
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-9999.ebuild
+++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/test_roscpp/Manifest b/dev-ros/test_roscpp/Manifest
index 8610b8f14a07..f034c7ed8def 100644
--- a/dev-ros/test_roscpp/Manifest
+++ b/dev-ros/test_roscpp/Manifest
@@ -1,7 +1,4 @@
-AUX boost.patch 1046 BLAKE2B f74c7018f277fa2cb525f68602599127eba9fa43cd29b706960de70c3757f9e4e22a3491f3f2d549a0c20abcdf70051449765bc0bad24bfb018a96b5f30022be SHA512 9391547e16815bd065bb467f13468c020006aaac0e49b6b86505ea3aefc110a2a342b47cf3c235fd5522d9881a8c9c85e142c15f00e4b1a627c6be9516738d37
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_roscpp-1.14.3-r1.ebuild 721 BLAKE2B 2cfdd691aedc99cda218504cacc6eeffcc96c75eed937fca3d5c2c04235363cc7a876ac87f6af5f1c318616aecb6c4838ea9d970bb2ce5991eb488175cd334bc SHA512 cf2c48391e89b87a39e3d368907a711a7ed7b470ce6ddcb676bd83dfe21df9c66d060c238307b333a38f3221ddc1a1e0d0cbb3614f7609120a60b4b0e8706622
-EBUILD test_roscpp-1.15.4.ebuild 683 BLAKE2B 1b890234f56dcc228bb2d1846de3c9a52bd4083634fafbf433daabcef6a388c5a6f59df7a9c820b4edf8d79f900b3f51b06514315cb9e62c0e271cf68e66a32b SHA512 c0dd1645817bfadae0ba1865cc219802378fbaaf0782d03784f3d14857ebade42c2380578bba87814e31b38ea0c10706e35d7712b399c2b0515eb5a150328b5b
-EBUILD test_roscpp-9999.ebuild 686 BLAKE2B 913ebd162894a4839ac240006a07f9007384d8066f71fcbef889b020b1283e5d528edc297e9f81497a984e152b6d0f1d91149bbaf0cdb437b2a6074ea51b9326 SHA512 88523b4bd636f6c066a7132bb0509c92cdfbfdbf24db72adef2c4461358c31c40f5c4f7db655aecbc41766429b50f73f1c7e247b7a956fefe2184e9079cd8df8
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD test_roscpp-1.15.7.ebuild 655 BLAKE2B 594e284b0c5706d6c9b1ffc3f1d78fc4ff0666638ac3449133e726fd76c9834b4302a72c77095c36e430105a670aab5bd3a559509807e9c817763da01bc93114 SHA512 11c06b435f27c328e4df7a6e84d47b30c54f735c2bdf69ddd98669c8ff1a0c9bdb778d7b2caedc49c275ab1fc3f87cba997a4d193d145833f323974feef72dc6
+EBUILD test_roscpp-9999.ebuild 655 BLAKE2B 594e284b0c5706d6c9b1ffc3f1d78fc4ff0666638ac3449133e726fd76c9834b4302a72c77095c36e430105a670aab5bd3a559509807e9c817763da01bc93114 SHA512 11c06b435f27c328e4df7a6e84d47b30c54f735c2bdf69ddd98669c8ff1a0c9bdb778d7b2caedc49c275ab1fc3f87cba997a4d193d145833f323974feef72dc6
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roscpp/files/boost.patch b/dev-ros/test_roscpp/files/boost.patch
deleted file mode 100644
index 41bac154d6ce..000000000000
--- a/dev-ros/test_roscpp/files/boost.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 41f18edc9f2f0b1ef304ea25f148bd56a6bf3d70
-Author: Maarten de Vries
-Date: Thu Jan 31 00:58:29 2019 +0100
-
- Remove signals from find_package(Boost COMPONENTS ...) (#1580)
-
- The packages use signals2, not signals. Only boost libraries with
- compiled code should be passed to find_package(Boost COMPONENTS ...),
- and the signals2 library has always been header only.
-
- Boost 1.69 has removed the deprecated signals library, so the otherwise
- useless but harmless `signals` component now breaks the build.
-
-diff --git a/test/test_roscpp/CMakeLists.txt b/test/test_roscpp/CMakeLists.txt
-index 519767362..01c3d6672 100644
---- a/test/test_roscpp/CMakeLists.txt
-+++ b/test/test_roscpp/CMakeLists.txt
-@@ -11,7 +11,7 @@ find_package(catkin REQUIRED COMPONENTS
- )
-
- if(CATKIN_ENABLE_TESTING)
-- find_package(Boost REQUIRED COMPONENTS signals filesystem system)
-+ find_package(Boost REQUIRED COMPONENTS filesystem system)
-
- include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
-
diff --git a/dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild b/dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild
deleted file mode 100644
index 8e988cf0c461..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=[threads]
- test? (
- dev-cpp/gtest
- )
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
-PATCHES=( "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.4.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.4.ebuild
deleted file mode 100644
index e1720ee72889..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.15.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=[threads]
- test? (
- dev-cpp/gtest
- )
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.7.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.7.ebuild
new file mode 100644
index 000000000000..235d2cb10b71
--- /dev/null
+++ b/dev-ros/test_roscpp/test_roscpp-1.15.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roscpp"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-ros/roscpp
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-ros/rosunit[${PYTHON_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-libs/boost:=[threads]
+ test? (
+ dev-cpp/gtest
+ )
+"
+REQUIRED_USE="test? ( ros_messages_cxx )"
diff --git a/dev-ros/test_roscpp/test_roscpp-9999.ebuild b/dev-ros/test_roscpp/test_roscpp-9999.ebuild
index 13637bb57f1f..235d2cb10b71 100644
--- a/dev-ros/test_roscpp/test_roscpp-9999.ebuild
+++ b/dev-ros/test_roscpp/test_roscpp-9999.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=test/${PN}
CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
inherit ros-catkin
diff --git a/dev-ros/test_rosgraph/Manifest b/dev-ros/test_rosgraph/Manifest
index 9e448054f960..af2b89608cd4 100644
--- a/dev-ros/test_rosgraph/Manifest
+++ b/dev-ros/test_rosgraph/Manifest
@@ -1,20 +1,4 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_rosgraph-1.13.0.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
-EBUILD test_rosgraph-1.13.1.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
-EBUILD test_rosgraph-1.13.2.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
-EBUILD test_rosgraph-1.13.4.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
-EBUILD test_rosgraph-1.13.5.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
-EBUILD test_rosgraph-1.13.6.ebuild 438 BLAKE2B f404da5764238b04f9eb7f055bc3726924311a8f7f77482e8c2ca65f6dab05d669f7abed15204263bc044e7841d6adbff29e5854d23d4ffab1102fac32a39788 SHA512 b4183c921be3b4856544b67a535721c0badd209b8e7c3f570ac5fb4684e1dcfd5dcfaa4ea08ab23b13b64a86d17fd01bf8e45b1e866d16fc5dd71109e723d274
-EBUILD test_rosgraph-1.14.2.ebuild 438 BLAKE2B f404da5764238b04f9eb7f055bc3726924311a8f7f77482e8c2ca65f6dab05d669f7abed15204263bc044e7841d6adbff29e5854d23d4ffab1102fac32a39788 SHA512 b4183c921be3b4856544b67a535721c0badd209b8e7c3f570ac5fb4684e1dcfd5dcfaa4ea08ab23b13b64a86d17fd01bf8e45b1e866d16fc5dd71109e723d274
-EBUILD test_rosgraph-1.14.3.ebuild 438 BLAKE2B f404da5764238b04f9eb7f055bc3726924311a8f7f77482e8c2ca65f6dab05d669f7abed15204263bc044e7841d6adbff29e5854d23d4ffab1102fac32a39788 SHA512 b4183c921be3b4856544b67a535721c0badd209b8e7c3f570ac5fb4684e1dcfd5dcfaa4ea08ab23b13b64a86d17fd01bf8e45b1e866d16fc5dd71109e723d274
-EBUILD test_rosgraph-1.15.4.ebuild 435 BLAKE2B a4e168d4de8994d37ce04b1835d22097a9d734aaff1ca12f9763eb62fe337ecf676b350ea5ccc4a388bcb59c40b04be37758cf7407648549887d0a79d708a48a SHA512 4a8b4124d0bf813e4ff89083806efab24654bee7a69ce7cbac71eba94ac2c1b07dbfb6f48a4526d8b665f8d7af660cb43d7c230e9ea353d1c974e911b8158806
-EBUILD test_rosgraph-9999.ebuild 438 BLAKE2B 7f9b25d24b5cab1d71ca26dc80adc38743677d4794e97dc06d8f9c8f40e0cbe42824928f279078bd7c8ea0fac89d17a331f22ced085397a58232be41de424422 SHA512 6a7779f57141d8c72a97e36d73411f5241b3839ff8d1a3d102314fee9192ff6ff637ae86918723a4fa1b8e5dc2523c6a8907ec655f3ec6f5e3abb25533f3a780
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD test_rosgraph-1.15.7.ebuild 407 BLAKE2B 1600a1e9fd19dedc9fa422911f2d14d8157149021e2a1cc9e8d2cb5030bc0bcf54610aa91756fad6cc059d6f9f295df2e23ecba7dd08e0732bd47320dea88d6b SHA512 d07ca80dc72469c6ad8ebcdbd040297689511b4bd4822db3e3c7348ddc171f1879f8d09a0cc47e66190ef07f7356aee301945aaa23a06925e8dd43eb878685bd
+EBUILD test_rosgraph-9999.ebuild 407 BLAKE2B 1600a1e9fd19dedc9fa422911f2d14d8157149021e2a1cc9e8d2cb5030bc0bcf54610aa91756fad6cc059d6f9f295df2e23ecba7dd08e0732bd47320dea88d6b SHA512 d07ca80dc72469c6ad8ebcdbd040297689511b4bd4822db3e3c7348ddc171f1879f8d09a0cc47e66190ef07f7356aee301945aaa23a06925e8dd43eb878685bd
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.0.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.0.ebuild
deleted file mode 100644
index a74f6b7bd3cb..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.1.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.1.ebuild
deleted file mode 100644
index a74f6b7bd3cb..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.2.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.2.ebuild
deleted file mode 100644
index a74f6b7bd3cb..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.4.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.4.ebuild
deleted file mode 100644
index a74f6b7bd3cb..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.5.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.5.ebuild
deleted file mode 100644
index a74f6b7bd3cb..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.6.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.6.ebuild
deleted file mode 100644
index e901f1348a64..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.14.2.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.14.2.ebuild
deleted file mode 100644
index e901f1348a64..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.14.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.14.3.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.14.3.ebuild
deleted file mode 100644
index e901f1348a64..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.14.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.4.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.4.ebuild
deleted file mode 100644
index 065166144a2e..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.15.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.7.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.7.ebuild
new file mode 100644
index 000000000000..d86623cabb6d
--- /dev/null
+++ b/dev-ros/test_rosgraph/test_rosgraph-1.15.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosgraph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-9999.ebuild b/dev-ros/test_rosgraph/test_rosgraph-9999.ebuild
index 03ab95277675..d86623cabb6d 100644
--- a/dev-ros/test_rosgraph/test_rosgraph-9999.ebuild
+++ b/dev-ros/test_rosgraph/test_rosgraph-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/test_roslaunch/Manifest b/dev-ros/test_roslaunch/Manifest
index 1382823011e9..364232e3a3ec 100644
--- a/dev-ros/test_roslaunch/Manifest
+++ b/dev-ros/test_roslaunch/Manifest
@@ -1,20 +1,4 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_roslaunch-1.13.0.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
-EBUILD test_roslaunch-1.13.1.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
-EBUILD test_roslaunch-1.13.2.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
-EBUILD test_roslaunch-1.13.4.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
-EBUILD test_roslaunch-1.13.5.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
-EBUILD test_roslaunch-1.13.6.ebuild 483 BLAKE2B 5823a43960ad28a1efb407a8e13bc4482329d2f9d893d2110a286d0dbfa76ea9c42ee3aa483780c2c586df817b19c8b08084ff603384e52d542c6a9d3f409117 SHA512 ff69459d80e8cebe100b59e89c29e09242762d67c3cfe5c115bb0a764f1a65f7c7a2cef29c5d0e7fedf0157b89a40e6173955878f1d2e2cd2bdd3bd97dfbf1ba
-EBUILD test_roslaunch-1.14.2.ebuild 483 BLAKE2B 5823a43960ad28a1efb407a8e13bc4482329d2f9d893d2110a286d0dbfa76ea9c42ee3aa483780c2c586df817b19c8b08084ff603384e52d542c6a9d3f409117 SHA512 ff69459d80e8cebe100b59e89c29e09242762d67c3cfe5c115bb0a764f1a65f7c7a2cef29c5d0e7fedf0157b89a40e6173955878f1d2e2cd2bdd3bd97dfbf1ba
-EBUILD test_roslaunch-1.14.3.ebuild 483 BLAKE2B 5823a43960ad28a1efb407a8e13bc4482329d2f9d893d2110a286d0dbfa76ea9c42ee3aa483780c2c586df817b19c8b08084ff603384e52d542c6a9d3f409117 SHA512 ff69459d80e8cebe100b59e89c29e09242762d67c3cfe5c115bb0a764f1a65f7c7a2cef29c5d0e7fedf0157b89a40e6173955878f1d2e2cd2bdd3bd97dfbf1ba
-EBUILD test_roslaunch-1.15.4.ebuild 480 BLAKE2B 07c6a5c1689ac56bb03e2326db4191cc308a632564bc0692cc3f5f8ac2ccff1f82aa5a2751a2a46d0f621af683eff60bf15f02cb08817cc0fdf532c459b7bee0 SHA512 a42224296a3a238a47be9a58184d80be676f80f35c2548952a696f107dd9de4154158318ded251cbc32f1de794869dca110cfbc0b33780f347df7120d0e69ae3
-EBUILD test_roslaunch-9999.ebuild 483 BLAKE2B 30e75a9862ea977d4aaf8f4429e35ec20ecc5999219c3d783b27f96de7ccaa18af6bbcf664611eda1b56933e3247b0e37dff999bb8532d8cc4f9586ba60afb72 SHA512 4d6f106652d163dcade1a720e50fe7ef7d3f219f9196128fc044b19fc98c8a4d183c5933d9aa8a152959f331f0b17fd1f8ff67c34f8c875b532d25af5a39e180
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD test_roslaunch-1.15.7.ebuild 452 BLAKE2B 33699bbeb2f3c8f16753fbfa30133201d9555fb73fd5f92fa1a687969446fbf7abcc3de1ced5ed6f893f7d291a67ff66a8568488bff398d4c67d16c6abd6cf9c SHA512 de3d2e11bfd71c0609bc7d0ff245781a309bfa43f79d15d71cb85d35d995b0218a200e1f8deb1021d0ad929e78c3a9003174bb4dc81b58eac1e3e9e040691acf
+EBUILD test_roslaunch-9999.ebuild 452 BLAKE2B 33699bbeb2f3c8f16753fbfa30133201d9555fb73fd5f92fa1a687969446fbf7abcc3de1ced5ed6f893f7d291a67ff66a8568488bff398d4c67d16c6abd6cf9c SHA512 de3d2e11bfd71c0609bc7d0ff245781a309bfa43f79d15d71cb85d35d995b0218a200e1f8deb1021d0ad929e78c3a9003174bb4dc81b58eac1e3e9e040691acf
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.13.0.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.13.0.ebuild
deleted file mode 100644
index e18f5a97cb79..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.13.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.13.1.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.13.1.ebuild
deleted file mode 100644
index e18f5a97cb79..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.13.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.13.2.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.13.2.ebuild
deleted file mode 100644
index e18f5a97cb79..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.13.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.13.4.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.13.4.ebuild
deleted file mode 100644
index e18f5a97cb79..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.13.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.13.5.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.13.5.ebuild
deleted file mode 100644
index e18f5a97cb79..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.13.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.13.6.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.13.6.ebuild
deleted file mode 100644
index 04a9794a2d44..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.13.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.14.2.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.14.2.ebuild
deleted file mode 100644
index 04a9794a2d44..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.14.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.14.3.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.14.3.ebuild
deleted file mode 100644
index 04a9794a2d44..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.14.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.4.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.4.ebuild
deleted file mode 100644
index 719c7c480b7b..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.15.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-ros/roslaunch[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.7.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.7.ebuild
new file mode 100644
index 000000000000..81fcb292797d
--- /dev/null
+++ b/dev-ros/test_roslaunch/test_roslaunch-1.15.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslaunch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ test? (
+ dev-ros/roslaunch[${PYTHON_USEDEP}]
+ dev-python/rospkg[${PYTHON_USEDEP}]
+ )
+"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild b/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild
index 0ebaf6fed5c2..81fcb292797d 100644
--- a/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild
+++ b/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/test_roslib_comm/Manifest b/dev-ros/test_roslib_comm/Manifest
index 66666f8e948f..a96182bfd9ab 100644
--- a/dev-ros/test_roslib_comm/Manifest
+++ b/dev-ros/test_roslib_comm/Manifest
@@ -1,7 +1,4 @@
-AUX yaml.patch 2213 BLAKE2B 28dc462a0861c30a9916dd3a42a44a78b411fdb81f2ae8e646f0fb6fe8f1653e5ffcb8a23d6e96bebcebb9073413496338d18cdfd94a25fe54564702e0f86687 SHA512 0cc5bc3627d012b82b5a07a1c24bc997c7c9a9a388cec32732e6b33f2d4e619eeb2f9c404f050ff129592235a73ffe27c2b63b1985108150a2033d504d37b246
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_roslib_comm-1.14.3-r1.ebuild 590 BLAKE2B b7451505b22995f0bc79b667e066fadf17ce14e1abac26bf65f72f5cf0af30726a4090f2417ea1f9fb1c48114b6c916333bdbbc688b4949c4ff77dea17e3d305 SHA512 56b579a588a93dcd88cbad7235a281c98219a291bf8b0de1313a97a2ae82342328ba186a12475f48cccfde8232191bd2efb7dc1433b71cc3c9ca428edf89694a
-EBUILD test_roslib_comm-1.15.4.ebuild 553 BLAKE2B c7c70b96915ca3aa2ee80b41dc992c7a099da29dbc8989511c99f7e1ea9f68d9c3505f5de8d1a3041a6d880025a5ebd425dd8370dc2ff8accfb979183ab029ef SHA512 edd4175c5b2594ec0da4fc551e4a86a946b07a668554d35c77a2a205c679729cd3ffac92a1a61d819112bc56a86b4a20e59b73b12a30bfb8342dae42ebfe4361
-EBUILD test_roslib_comm-9999.ebuild 556 BLAKE2B 500e11a34be014312a1e6432df777843bafb425e09d976cf3c7e4aa86eb8a8c1f085f76d48841aad243b97f1fdf87b79fbdd84b2294089bb6520701923c92939 SHA512 34db49c0d2de9f563da46e1ec3b87a0b4adfe9b99e6b6bbfce2b2b176320ce6f27d9f05c8c47346d07088b23d9f7771a56b7f346bbefc340c8ff5d116523def8
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD test_roslib_comm-1.15.7.ebuild 524 BLAKE2B 33e725ed3e3ae5224b4e0b578c9e1b503599089f84324c7bd6e01c726cdf634141cfd17d3422faf4b88b6f3c4f510b6d3d8a6f7dfba2a5484d5fb11599cd1038 SHA512 f78af7ebff90a082fd991bc2e25bcb5bae4b793897432b384cce593af64374f661221d011d6156765dc4c179c36a2f5b42523fa94518c5143ffd44906be0c035
+EBUILD test_roslib_comm-9999.ebuild 524 BLAKE2B 33e725ed3e3ae5224b4e0b578c9e1b503599089f84324c7bd6e01c726cdf634141cfd17d3422faf4b88b6f3c4f510b6d3d8a6f7dfba2a5484d5fb11599cd1038 SHA512 f78af7ebff90a082fd991bc2e25bcb5bae4b793897432b384cce593af64374f661221d011d6156765dc4c179c36a2f5b42523fa94518c5143ffd44906be0c035
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roslib_comm/files/yaml.patch b/dev-ros/test_roslib_comm/files/yaml.patch
deleted file mode 100644
index a72173c32b8a..000000000000
--- a/dev-ros/test_roslib_comm/files/yaml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py | 2 +-
- .../test/test_roslib_message.py | 2 +-
- .../client_verification/test_slave_api.py | 2 +-
- test/test_rosparam/test/check_rosparam.py | 8 ++---
- .../check_rosparam_command_line_online.py | 2 +-
- .../check_rosservice_command_line_online.py | 4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py | 2 +-
- tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
- tools/roslaunch/src/roslaunch/loader.py | 4 +--
- .../test/unit/test_roslaunch_dump_params.py | 4 +--
- tools/rosparam/src/rosparam/__init__.py | 7 ++++-
- tools/rosservice/src/rosservice/__init__.py | 4 +--
- tools/rostopic/src/rostopic/__init__.py | 6 ++--
- tools/topic_tools/scripts/relay_field | 2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/test/test_roslib_comm/test/test_roslib_message.py b/test/test_roslib_comm/test/test_roslib_message.py
-index 3d4e7a6fa..288cc375b 100644
---- a/test/test_roslib_comm/test/test_roslib_message.py
-+++ b/test/test_roslib_comm/test/test_roslib_message.py
-@@ -61,7 +61,7 @@ def test_strify_message(self):
- def roundtrip(m):
- yaml_text = strify_message(m)
- print(yaml_text)
-- loaded = yaml.load(yaml_text)
-+ loaded = yaml.safe_load(yaml_text)
- print("loaded", loaded)
- new_inst = m.__class__()
- if loaded is not None:
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3-r1.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3-r1.ebuild
deleted file mode 100644
index 4790aa7d9cba..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
-"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.4.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.4.ebuild
deleted file mode 100644
index ae126d32d92f..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
-"
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.7.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.7.ebuild
new file mode 100644
index 000000000000..aa2a38935294
--- /dev/null
+++ b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslib"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
+"
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-9999.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-9999.ebuild
index 6e3cc6e9db0c..aa2a38935294 100644
--- a/dev-ros/test_roslib_comm/test_roslib_comm-9999.ebuild
+++ b/dev-ros/test_roslib_comm/test_roslib_comm-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
@@ -9,8 +9,6 @@ ROS_SUBDIR=test/${PN}
CATKIN_HAS_MESSAGES=yes
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-PYTHON_COMPAT=( python2_7 )
-
inherit ros-catkin
DESCRIPTION="Unit tests for roslib"
diff --git a/dev-ros/test_rosmaster/Manifest b/dev-ros/test_rosmaster/Manifest
index 884fb3c15fb7..6ff5e581f899 100644
--- a/dev-ros/test_rosmaster/Manifest
+++ b/dev-ros/test_rosmaster/Manifest
@@ -1,9 +1,4 @@
-AUX empty.patch 389 BLAKE2B 7ff08d2bd3cc7c14a4e93cc2ff4a89029f8e922f545c707d14b604a207170a1bbe8f0321c64882d6cc0f614670a8fe6f173e787c7b672a60afb1f8a3a289fe11 SHA512 c6ae83e53ec66fe390647e04c0ddf4ab8a7fcd20dfc6ab4c26012011f8033d3f5120f05eb7f6a71da361592058bcea521ca7839f3158c2fb63b68961c01ef9e6
-AUX py3.patch 2361 BLAKE2B 778987cf4fa20faf2bc883f6715f6c05a0631037bcab799e73e842c18ca1aa2cdbe1ac483d1e160a41eb24c6cac17ae9aff7c14ab86813d348281191948445b2 SHA512 f4f53a5caed1a11c1d0619d2f9a883fc30c35f4f431461074a4e1c79b478be41de7702299fa10ab0c187662aaa1531f184a3748a6944c9eb44130899b0222d6c
-AUX yaml.patch 2233 BLAKE2B 174e7417282c07960ddb76381f79d4cae9ccfd3c9c99add5f0e5dfa610b84fb437b8d6410937bfe048640e082fba23c0544df1dbfd5422b74d9500b5f21468e2 SHA512 ef38c5408dc694bef305746f31b6e0a2b5711968dd5f54a290d5d7eec4c09631fd5773a22443d7c02bc0ef5e275986c7b3755d9acbfa971085e2b67e37f53103
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_rosmaster-1.14.3-r2.ebuild 782 BLAKE2B 55c8a2d6a8323107a49e6877989a037a57e9e7807816fdef4d57c0a458909df2fee6d689d27d5fe8ed8142bd4fe4b3732f4019ecc90dfc24950d175d12733649 SHA512 6c280c81ac9c8fe6d362fc34ad9c119adef908be96dbffa0f8fe272f7b344b1aef573a698238b1f3cae01390d98830ed54d44ac1768b8c12f6ce2b213dc2a402
-EBUILD test_rosmaster-1.15.4.ebuild 695 BLAKE2B 0b710c893ec0d6a12650e6f35e53589b855c12bd736c3fc84dc054bce00079baf84b28fc34b823d67b6f59bec368bececf4743dc31cc91d0c3ab249f431a5adb SHA512 3cf4cf844c95f5e275da51f0650763b0cdd2d4c8dcf9e1485a5cf6fb4854703b1a220d2c900f97ae1c5e7068562eca67e6f3f325bb855e632c68be5d664932e8
-EBUILD test_rosmaster-9999.ebuild 698 BLAKE2B d5b4d4a9029b5fb5d967a146d22f056f48bab5c55d71db031322feadd8dbd11cccd46dfb8bba77bf70328e24b329e3bdb7df824c9706f30c5dd7e40f1d5c9eb0 SHA512 99dc926c24a752cedb957d9322d1f9a76ca3eb1855ef485ba81fe12fcca2641ecebc960279dbc04739a14cdb77e807cc012233419d6d7c7466b4778c2f5d9498
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD test_rosmaster-1.15.7.ebuild 666 BLAKE2B b34658e0ee052007658b4e574f51bd179cb508de03e00c6a7be6215a7aed1ec40d9473d800c4b01f1738bb0f48dc5e6ef4804c32a2295c9aaa1b0df73762bc8f SHA512 248f2279a2be6b02fa11aadfdc4c2d244206230bbd995aa01e762cbcc901c2f14f4bcc941e6060df4be7474e057c4a0d57f71c67e4be6b38dde1bf99af6a835d
+EBUILD test_rosmaster-9999.ebuild 666 BLAKE2B b34658e0ee052007658b4e574f51bd179cb508de03e00c6a7be6215a7aed1ec40d9473d800c4b01f1738bb0f48dc5e6ef4804c32a2295c9aaa1b0df73762bc8f SHA512 248f2279a2be6b02fa11aadfdc4c2d244206230bbd995aa01e762cbcc901c2f14f4bcc941e6060df4be7474e057c4a0d57f71c67e4be6b38dde1bf99af6a835d
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosmaster/files/empty.patch b/dev-ros/test_rosmaster/files/empty.patch
deleted file mode 100644
index 8ec371c917c0..000000000000
--- a/dev-ros/test_rosmaster/files/empty.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: test_rosmaster/CMakeLists.txt
-===================================================================
---- test_rosmaster.orig/CMakeLists.txt
-+++ test_rosmaster/CMakeLists.txt
-@@ -10,6 +10,7 @@ if(CATKIN_ENABLE_TESTING)
- String.msg
- Arrays.msg
- CompositeA.msg CompositeB.msg Composite.msg
-+ Empty.msg
- Embed.msg Floats.msg Simple.msg
- RosmsgA.msg
- RosmsgB.msg
diff --git a/dev-ros/test_rosmaster/files/py3.patch b/dev-ros/test_rosmaster/files/py3.patch
deleted file mode 100644
index 579d24f9f0b5..000000000000
--- a/dev-ros/test_rosmaster/files/py3.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001
-From: Dirk Thomas
-Date: Tue, 6 Aug 2019 12:50:24 -0700
-Subject: [PATCH] more Python 3 compatibility (#1782)
-
----
- test/test_rosmaster/test/nodes/testAllCommonFlows | 2 +-
- test/test_rosmaster/test/nodes/testMaster | 2 +-
- test/test_rosmaster/test/nodes/testSlave | 2 +-
- test/test_rospy/test/unit/test_genmsg_py.py | 8 +++++++-
- tools/rosgraph/test/test_roslogging.py | 5 ++++-
- tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++-
- tools/roslaunch/src/roslaunch/depends.py | 8 ++++----
- 7 files changed, 22 insertions(+), 10 deletions(-)
-
-diff --git a/test/test_rosmaster/test/nodes/testAllCommonFlows b/test/test_rosmaster/test/nodes/testAllCommonFlows
-index 4d3e053f8..a22ffb8d8 100755
---- a/test/test_rosmaster/test/nodes/testAllCommonFlows
-+++ b/test/test_rosmaster/test/nodes/testAllCommonFlows
-@@ -12,7 +12,7 @@ import sys, os
- BOOTSTRAP_VERSION = "0.1"
-
- # Read in ROS_ROOT
--if not os.environ.has_key('ROS_ROOT'):
-+if 'ROS_ROOT' not in os.environ:
- print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the
- location of your ROS install.\n"""
- sys.exit(-1)
-diff --git a/test/test_rosmaster/test/nodes/testMaster b/test/test_rosmaster/test/nodes/testMaster
-index f3ec36be4..4dca1cb4a 100755
---- a/test/test_rosmaster/test/nodes/testMaster
-+++ b/test/test_rosmaster/test/nodes/testMaster
-@@ -12,7 +12,7 @@ import sys, os
- BOOTSTRAP_VERSION = "0.1"
-
- # Read in ROS_ROOT
--if not os.environ.has_key('ROS_ROOT'):
-+if 'ROS_ROOT' not in os.environ:
- print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the
- location of your ROS install.\n"""
- sys.exit(-1)
-diff --git a/test/test_rosmaster/test/nodes/testSlave b/test/test_rosmaster/test/nodes/testSlave
-index cf70af08b..f8ea7cb47 100755
---- a/test/test_rosmaster/test/nodes/testSlave
-+++ b/test/test_rosmaster/test/nodes/testSlave
-@@ -12,7 +12,7 @@ import sys, os
- BOOTSTRAP_VERSION = "0.1"
-
- # Read in ROS_ROOT
--if not os.environ.has_key('ROS_ROOT'):
-+if 'ROS_ROOT' not in os.environ:
- print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the
- location of your ROS install.\n"""
- sys.exit(-1)
diff --git a/dev-ros/test_rosmaster/files/yaml.patch b/dev-ros/test_rosmaster/files/yaml.patch
deleted file mode 100644
index 2eb9c086b7e4..000000000000
--- a/dev-ros/test_rosmaster/files/yaml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py | 2 +-
- .../test/test_roslib_message.py | 2 +-
- .../client_verification/test_slave_api.py | 2 +-
- test/test_rosparam/test/check_rosparam.py | 8 ++---
- .../check_rosparam_command_line_online.py | 2 +-
- .../check_rosservice_command_line_online.py | 4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py | 2 +-
- tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
- tools/roslaunch/src/roslaunch/loader.py | 4 +--
- .../test/unit/test_roslaunch_dump_params.py | 4 +--
- tools/rosparam/src/rosparam/__init__.py | 7 ++++-
- tools/rosservice/src/rosservice/__init__.py | 4 +--
- tools/rostopic/src/rostopic/__init__.py | 6 ++--
- tools/topic_tools/scripts/relay_field | 2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/test/test_rosmaster/test/client_verification/test_slave_api.py b/test/test_rosmaster/test/client_verification/test_slave_api.py
-index 63d919c72..8614c045d 100755
---- a/test/test_rosmaster/test/client_verification/test_slave_api.py
-+++ b/test/test_rosmaster/test/client_verification/test_slave_api.py
-@@ -106,7 +106,7 @@ def __init__(self, *args, **kwds):
- def load_profile(self, filename):
- import yaml
- with open(filename) as f:
-- d = yaml.load(f)
-+ d = yaml.safe_load(f)
- self.required_pubs = d.get('pubs', {})
- self.required_subs = d.get('subs', {})
-
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild
deleted file mode 100644
index d09c050ee2a7..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/empty.patch" "${FILESDIR}/py3.patch" )
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
- ros-catkin_src_install
- dodir /usr/share/${PN}
- cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.15.4.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.4.ebuild
deleted file mode 100644
index ea88573de821..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.15.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
- ros-catkin_src_install
- dodir /usr/share/${PN}
- cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.15.7.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.7.ebuild
new file mode 100644
index 000000000000..ce3dc8154500
--- /dev/null
+++ b/dev-ros/test_rosmaster/test_rosmaster-1.15.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosmaster"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-ros/std_msgs[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/roslib[${PYTHON_USEDEP}] )
+"
+
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
+
+src_install() {
+ ros-catkin_src_install
+ dodir /usr/share/${PN}
+ cp -a test "${ED}//usr/share/${PN}/" || die
+}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild b/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild
index aec1968cf2c2..ce3dc8154500 100644
--- a/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild
+++ b/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=test/${PN}
CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-
inherit ros-catkin
DESCRIPTION="Unit tests for rosmaster"
diff --git a/dev-ros/test_rosparam/Manifest b/dev-ros/test_rosparam/Manifest
index 80a4a8a83e80..143528f1ffa8 100644
--- a/dev-ros/test_rosparam/Manifest
+++ b/dev-ros/test_rosparam/Manifest
@@ -1,7 +1,4 @@
-AUX yaml.patch 3286 BLAKE2B ff83da906b271b957a63e89b26b7ab8b30abf8464635ac773a23d86a82d304ad09fcb9f78eba4f599655231ba59bb509fa89f146529f927742480eb4b777ca37 SHA512 85c1674cc7de77b08e8f632df97e772a325b5595086153690a289f8c2f33e9392ade4a17ab198969baf21f17f2e0414df4aefc2eb758866fa0da2ffe069f5ed0
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_rosparam-1.14.3.ebuild 537 BLAKE2B ee1b480b906b2606b85c128dfe22e364187bb6866606623bb524e82d2be666bb59d5da501493dfe7fd0933a1c2037cc406802bd9fd2d020b2edce336b5a0dcb4 SHA512 7f6700c3584b8500757db238544252360b1426b7a1b863b15f33fde7a50f87e52f3915181df6db8ea80d7e8a353b1003bc0ca29c0689bfdf83ee2460349eb85e
-EBUILD test_rosparam-1.15.4.ebuild 500 BLAKE2B c4e62babd10d7dda9da6769b5094c763759ff9afa3d05b5fc54b26c17bb19feca8d202de279541a38aa7625acff8815c95670ff2912b08f1094d764c6de1a282 SHA512 d5ae65e1cf92443d496a116e2829a4d5fbccc36980c47fad6c6879995714c772567b88f49b5c5a49e778ae3379d06f747621558eae6503ae87232713e5cb0148
-EBUILD test_rosparam-9999.ebuild 503 BLAKE2B e065bfcfa421c3de64ad8840a544eb4f427c3b2753b38b64960b51e4a9f432d7d3a6e8f2f4ef5303e47c0005e533deea5f34cd63369febb1f05ea3ac0bfb460f SHA512 a36d13dae004b782d566d5c7edf5ebe551c6e6a4d5213904824b1ccacfb61b24c437d01765fe96d584ffcc497fee7a3a630c3bbd45d0849fd0b460289ba8a654
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD test_rosparam-1.15.7.ebuild 471 BLAKE2B ee5d01c0e44234935472d0f833c93c61339997a10fd0b7bf09bd6fc648b1ae1187f3f679e84bccf76be2ce2275d8cf82fdf1ee7b116254a10858df60588f4da3 SHA512 2d71d611ce4fa620ba34c98fe225f0e3a67f81107463fc8db5291896abe5266536d5da56352ca6927a3dbc2099abee11f88885a6cbc1084980db397eb4cc4324
+EBUILD test_rosparam-9999.ebuild 471 BLAKE2B ee5d01c0e44234935472d0f833c93c61339997a10fd0b7bf09bd6fc648b1ae1187f3f679e84bccf76be2ce2275d8cf82fdf1ee7b116254a10858df60588f4da3 SHA512 2d71d611ce4fa620ba34c98fe225f0e3a67f81107463fc8db5291896abe5266536d5da56352ca6927a3dbc2099abee11f88885a6cbc1084980db397eb4cc4324
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosparam/files/yaml.patch b/dev-ros/test_rosparam/files/yaml.patch
deleted file mode 100644
index 48f2c1d5bb19..000000000000
--- a/dev-ros/test_rosparam/files/yaml.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py | 2 +-
- .../test/test_roslib_message.py | 2 +-
- .../client_verification/test_slave_api.py | 2 +-
- test/test_rosparam/test/check_rosparam.py | 8 ++---
- .../check_rosparam_command_line_online.py | 2 +-
- .../check_rosservice_command_line_online.py | 4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py | 2 +-
- tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
- tools/roslaunch/src/roslaunch/loader.py | 4 +--
- .../test/unit/test_roslaunch_dump_params.py | 4 +--
- tools/rosparam/src/rosparam/__init__.py | 7 ++++-
- tools/rosservice/src/rosservice/__init__.py | 4 +--
- tools/rostopic/src/rostopic/__init__.py | 6 ++--
- tools/topic_tools/scripts/relay_field | 2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/test/test_rosparam/test/check_rosparam.py b/test/test_rosparam/test/check_rosparam.py
-index 52ed976b5..fe8c03fb4 100755
---- a/test/test_rosparam/test/check_rosparam.py
-+++ b/test/test_rosparam/test/check_rosparam.py
-@@ -227,7 +227,7 @@ def test_rosparam_get(self):
- with fakestdout() as b:
- rosparam.yamlmain([cmd, 'get', "g1"])
- import yaml
-- d = yaml.load(b.getvalue())
-+ d = yaml.safe_load(b.getvalue())
- self.assertEquals(d['float'], 10.0)
- self.assertEquals(d['int'], 10.0)
- self.assertEquals(d['string'], "g1-foo-value")
-@@ -346,18 +346,18 @@ def test_rosparam_dump(self):
- import yaml
- with open(f_out) as b:
- with open(f) as b2:
-- self.assertEquals(yaml.load(b.read()), yaml.load(b2.read()))
-+ self.assertEquals(yaml.safe_load(b.read()), yaml.safe_load(b2.read()))
-
- rosparam.yamlmain([cmd, 'dump', '-v', f_out, 'rosparam_dump'])
- with open(f_out) as b:
- with open(f) as b2:
-- self.assertEquals(yaml.load(b.read()), yaml.load(b2.read()))
-+ self.assertEquals(yaml.safe_load(b.read()), yaml.safe_load(b2.read()))
-
- # yaml file and std_out should be the same
- with fakestdout() as b:
- rosparam.yamlmain([cmd, 'dump'])
- with open(f) as b2:
-- self.assertEquals(yaml.load(b.getvalue())['rosparam_dump'], yaml.load(b2.read()))
-+ self.assertEquals(yaml.safe_load(b.getvalue())['rosparam_dump'], yaml.safe_load(b2.read()))
-
- def test_fullusage(self):
- import rosparam
diff --git a/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild b/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild
deleted file mode 100644
index 9deec865fa13..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- )"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.4.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.4.ebuild
deleted file mode 100644
index 5193bcbb1300..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.15.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.7.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.7.ebuild
new file mode 100644
index 000000000000..58010524e0b6
--- /dev/null
+++ b/dev-ros/test_rosparam/test_rosparam-1.15.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosparam"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-ros/rosparam[${PYTHON_USEDEP}]
+ )"
diff --git a/dev-ros/test_rosparam/test_rosparam-9999.ebuild b/dev-ros/test_rosparam/test_rosparam-9999.ebuild
index 3a0084ca2436..58010524e0b6 100644
--- a/dev-ros/test_rosparam/test_rosparam-9999.ebuild
+++ b/dev-ros/test_rosparam/test_rosparam-9999.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=test/${PN}
CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-
inherit ros-catkin
DESCRIPTION="Unit tests for rosparam"
diff --git a/dev-ros/test_rospy/Manifest b/dev-ros/test_rospy/Manifest
index bef3d7bf4c91..09988d5bafd5 100644
--- a/dev-ros/test_rospy/Manifest
+++ b/dev-ros/test_rospy/Manifest
@@ -1,8 +1,4 @@
-AUX py3-2.patch 2077 BLAKE2B 76b3289eb5a54e085d8ed2b687b70f53c047625a9b4216f4972f62702604192996b89d0469a5d927515c510f00a032919b40b9cd76db8e9e011c61fc37c50e28 SHA512 8b554bbc2a38e3d64a88e05921a8e0ed8271126e86f85f04bf0903224304a25df07530614435247a861b193c0a02a2fd0280488696f9196e6f3bf88b8e89da9e
-AUX py3.patch 1169 BLAKE2B e73fa2afdde33f8fc921118b4bc1189b5f976a2dcc56f498890e1925c698b975c38dec6c6be24f7269e0dce83d2630eaba89b9aa925c249037720d15928d7a9d SHA512 8b5475d81200b724701e3f7312646105295f99d084e324f8990cc494609166d77b834309e19f36452133379682f33174d923d8fbb05f95a75306147c3bac154d
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_rospy-1.14.3-r1.ebuild 902 BLAKE2B cc2d72203d6026d6c2fc9694bbbfe92f8af379ec3e0284b67684d30e432757834869710db15e0f546a8c817ccdd6f1cf6e145e68a4a2700ad694c6ca2a6d53bd SHA512 38ecb314607a3db7c111a889f885238a383208f89a8ee952356f44ece4669540f353e81be2d3c45fb3e5aef0c5b3a20c62f9c2db4316e91352caf601560998cb
-EBUILD test_rospy-1.15.4.ebuild 840 BLAKE2B a2b7bd4ee2342d2c780d470d94291bd7557e5ed974d869cffd65c0b06c3bf8be0dbf0621c5866972893c987acaf8e57da71ec05c7a5cc51e8cec9267a82626f6 SHA512 807a14b5886ae3b3e1e1bb230e47db02f9023ccb4c0f47cc4685a39d8e21576dbc1870fa441a33fbf5f84b82aaa4b77833f3eb1c6f488061dad8915d68b6b36c
-EBUILD test_rospy-9999.ebuild 843 BLAKE2B 95bee07029a08cc289842cab2529c1854f1af6ea706853c51725ae88e6e50cad233090f48dfb4c203747a3e4d1fb7849caaf7daa3865730bc6bcb02e295cb77f SHA512 0351a18324e0c5c13cb36af850383a9c904ac8d5bd8f005dfafa6fa1e84a7a9377aaa8fd760036cc7057ee2d4f210f924fed6e65147da9a6c7676f31c75d54a0
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD test_rospy-1.15.7.ebuild 811 BLAKE2B cfc23e3cb5b20c678e66919fbe5bd14cb60bcd7832728f711e5380677d4a7f6fb6069b484469520d17d3c9cce404be722deef226269ce6cc3da1900de0618b70 SHA512 7359bc55ae461dee520cbdfc1f057cf4f93c72ff7839ac1b47ae4b18b8fe1339e6d898693490a0d6ec3197bc8a89451706e3d548d1ee4c38f2c5b176073051ac
+EBUILD test_rospy-9999.ebuild 811 BLAKE2B cfc23e3cb5b20c678e66919fbe5bd14cb60bcd7832728f711e5380677d4a7f6fb6069b484469520d17d3c9cce404be722deef226269ce6cc3da1900de0618b70 SHA512 7359bc55ae461dee520cbdfc1f057cf4f93c72ff7839ac1b47ae4b18b8fe1339e6d898693490a0d6ec3197bc8a89451706e3d548d1ee4c38f2c5b176073051ac
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rospy/files/py3-2.patch b/dev-ros/test_rospy/files/py3-2.patch
deleted file mode 100644
index 18ac23d16866..000000000000
--- a/dev-ros/test_rospy/files/py3-2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
-From: Dirk Thomas
-Date: Tue, 6 Aug 2019 16:06:51 -0700
-Subject: [PATCH] more Python 3 compatibility (#1783)
-
----
- test/test_rospy/test/unit/test_genmsg_py.py | 6 +--
- tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
- .../test/test_roslogging_user_logger.py | 8 +++-
- tools/roslaunch/test/unit/test_xmlloader.py | 2 +-
- tools/rosmsg/src/rosmsg/__init__.py | 2 +-
- tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
- .../test/test_rosmsgproto_command_line.py | 20 ++++----
- .../test_rostopic_command_line_offline.py | 44 +++++++++---------
- 8 files changed, 67 insertions(+), 63 deletions(-)
-
-diff --git a/test/test_rospy/test/unit/test_genmsg_py.py b/test/test_rospy/test/unit/test_genmsg_py.py
-index 397b35cee..38be1648e 100644
---- a/test/test_rospy/test/unit/test_genmsg_py.py
-+++ b/test/test_rospy/test/unit/test_genmsg_py.py
-@@ -95,8 +95,8 @@ def test_test_rospy_TestFixedArray(self):
- self.assertEquals([0., 0., 0.], m.f64_3)
- self.assertEquals([0], m.i8_1)
- self.assertEquals([0, 0, 0], m.i8_3)
-- self.assertEquals(chr(0), m.u8_1)
-- self.assertEquals(chr(0)*3, m.u8_3)
-+ self.assertEquals(chr(0).encode(), m.u8_1)
-+ self.assertEquals((chr(0)*3).encode(), m.u8_3)
- self.assertEquals([0], m.i32_1)
- self.assertEquals([0, 0, 0], m.i32_3)
- self.assertEquals([0], m.u32_1)
-@@ -358,7 +358,7 @@ def test_std_msgs_MultiArray(self):
- # test. the buff was with the uint8[] type consistency
- buff = StringIO()
- self.assertEquals(UInt8MultiArray(),UInt8MultiArray())
-- self.assertEquals('',UInt8MultiArray().data)
-+ self.assertEquals(b'', UInt8MultiArray().data)
- UInt8MultiArray().serialize(buff)
- self.assertEquals(UInt8MultiArray(layout=MultiArrayLayout()),UInt8MultiArray())
- UInt8MultiArray(layout=MultiArrayLayout()).serialize(buff)
diff --git a/dev-ros/test_rospy/files/py3.patch b/dev-ros/test_rospy/files/py3.patch
deleted file mode 100644
index d7ed0f9c9606..000000000000
--- a/dev-ros/test_rospy/files/py3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001
-From: Dirk Thomas
-Date: Tue, 6 Aug 2019 12:50:24 -0700
-Subject: [PATCH] more Python 3 compatibility (#1782)
-
----
- test/test_rosmaster/test/nodes/testAllCommonFlows | 2 +-
- test/test_rosmaster/test/nodes/testMaster | 2 +-
- test/test_rosmaster/test/nodes/testSlave | 2 +-
- test/test_rospy/test/unit/test_genmsg_py.py | 8 +++++++-
- tools/rosgraph/test/test_roslogging.py | 5 ++++-
- tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++-
- tools/roslaunch/src/roslaunch/depends.py | 8 ++++----
- 7 files changed, 22 insertions(+), 10 deletions(-)
-
-diff --git a/test/test_rospy/test/unit/test_genmsg_py.py b/test/test_rospy/test/unit/test_genmsg_py.py
-index aebf95b22..397b35cee 100644
---- a/test/test_rospy/test/unit/test_genmsg_py.py
-+++ b/test/test_rospy/test/unit/test_genmsg_py.py
-@@ -44,7 +44,13 @@
- import math
-
- from roslib.message import SerializationError
--
-+
-+try:
-+ long
-+except NameError:
-+ long = int
-+
-+
- class TestGenmsgPy(unittest.TestCase):
-
- def test_PythonKeyword(self):
diff --git a/dev-ros/test_rospy/test_rospy-1.14.3-r1.ebuild b/dev-ros/test_rospy/test_rospy-1.14.3-r1.ebuild
deleted file mode 100644
index 2cf6f2717553..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-ros/rosbuild
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/py3-2.patch" )
diff --git a/dev-ros/test_rospy/test_rospy-1.15.4.ebuild b/dev-ros/test_rospy/test_rospy-1.15.4.ebuild
deleted file mode 100644
index a60ab86abc52..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.15.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-ros/rosbuild
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rospy/test_rospy-1.15.7.ebuild b/dev-ros/test_rospy/test_rospy-1.15.7.ebuild
new file mode 100644
index 000000000000..5ef4d24bcaec
--- /dev/null
+++ b/dev-ros/test_rospy/test_rospy-1.15.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosunit[${PYTHON_USEDEP}]
+ test? (
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-ros/rosbuild
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ )"
diff --git a/dev-ros/test_rospy/test_rospy-9999.ebuild b/dev-ros/test_rospy/test_rospy-9999.ebuild
index a87a452ada24..5ef4d24bcaec 100644
--- a/dev-ros/test_rospy/test_rospy-9999.ebuild
+++ b/dev-ros/test_rospy/test_rospy-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
@@ -9,8 +9,6 @@ ROS_SUBDIR=test/${PN}
CATKIN_HAS_MESSAGES=yes
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-PYTHON_COMPAT=( python2_7 )
-
inherit ros-catkin
DESCRIPTION="Unit tests for rospy"
diff --git a/dev-ros/test_rosservice/Manifest b/dev-ros/test_rosservice/Manifest
index 6c1171139730..dcb36ca71100 100644
--- a/dev-ros/test_rosservice/Manifest
+++ b/dev-ros/test_rosservice/Manifest
@@ -1,7 +1,4 @@
-AUX yaml.patch 2877 BLAKE2B af708d68c805323af1e337789798c0318f49e7805cc3b6a52a895edff40fcb71a48c467c2e009c04f19e5ad75231f07e60d94cbfe2baa7a47a5d3d4cd78bd379 SHA512 cd3099ed89f475603151e290dbdddcc170bad5a01002ce51e5a44ceed0ab864480e8daf1eaaf3ab5fbf4fec550f6a0e91ec7dc6400b2fb227abc2bdadc3d64b2
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_rosservice-1.14.3-r1.ebuild 713 BLAKE2B faacb0d4583af8cde634e608012ed3d1d89a0cd912a54f3c8931a109d3e2ab06965c85c123e7bd92cc83a1a86bc222e5f6648e079dc9e2644ae19268bf96d2b5 SHA512 8604ba792e6a01dc7f085061889d278d48474da3ad21a2580f560ba771dafb3041afd2fe9a797c886bc01af8f04c7f4108f0c8387c25501d5ef3d1667813373a
-EBUILD test_rosservice-1.15.4.ebuild 676 BLAKE2B ecff62b277ac96c0c94754d50a0b1640eebba549a86661f69aebf693ec39d5f66114a7f366ce1adeced5523aa3ffcb7b5d2a4d60fc7e6232f5b8dffa69680e73 SHA512 71453f94f88b1055698f09b4688ad25b5b61246eac009b7a7abed9f13ded12ab158029b16ec76e1900dd2dd8591744db95bdb40d54a20296a01cd04cf0b38f3a
-EBUILD test_rosservice-9999.ebuild 679 BLAKE2B d8c7decce6abc14a7e9c0d9b36a40a001c282333d0e50e8caf7c8598b646adb458bce1aadd01a2a97639dac10d2ec7a232f8145c6fb6a904eb83311bbb47afae SHA512 36c5673453deb431ee1e5816af18510e7bfd9d324089e6bf05af963ef4d769ddc2d8d1d04796f849b75a8d0aeb0dc9663fa9747c07ad20c68934e258e0d273cc
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD test_rosservice-1.15.7.ebuild 647 BLAKE2B e56267d6e79a6f5d8c2366975eed0e29356a3d618b05989d16cd15a95a1f6de5f4a56261998cf47af1944dbae18c33dadb04ae0c11d8ccce543ac9d11b35dd92 SHA512 8fb7870baa8b55c75c388535ebaa2f4f5b116ab4d8d0e01e3ce964e76f275859ef43aa1a29bdecee46d0f1eadc0a35a62809dcd7fde9b44c66f579750274f42b
+EBUILD test_rosservice-9999.ebuild 647 BLAKE2B e56267d6e79a6f5d8c2366975eed0e29356a3d618b05989d16cd15a95a1f6de5f4a56261998cf47af1944dbae18c33dadb04ae0c11d8ccce543ac9d11b35dd92 SHA512 8fb7870baa8b55c75c388535ebaa2f4f5b116ab4d8d0e01e3ce964e76f275859ef43aa1a29bdecee46d0f1eadc0a35a62809dcd7fde9b44c66f579750274f42b
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosservice/files/yaml.patch b/dev-ros/test_rosservice/files/yaml.patch
deleted file mode 100644
index e8d089cbfd09..000000000000
--- a/dev-ros/test_rosservice/files/yaml.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py | 2 +-
- .../test/test_roslib_message.py | 2 +-
- .../client_verification/test_slave_api.py | 2 +-
- test/test_rosparam/test/check_rosparam.py | 8 ++---
- .../check_rosparam_command_line_online.py | 2 +-
- .../check_rosservice_command_line_online.py | 4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py | 2 +-
- tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
- tools/roslaunch/src/roslaunch/loader.py | 4 +--
- .../test/unit/test_roslaunch_dump_params.py | 4 +--
- tools/rosparam/src/rosparam/__init__.py | 7 ++++-
- tools/rosservice/src/rosservice/__init__.py | 4 +--
- tools/rostopic/src/rostopic/__init__.py | 6 ++--
- tools/topic_tools/scripts/relay_field | 2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/test/test_rosservice/test/check_rosservice_command_line_online.py b/test/test_rosservice/test/check_rosservice_command_line_online.py
-index dc696adba..c75a52c15 100755
---- a/test/test_rosservice/test/check_rosservice_command_line_online.py
-+++ b/test/test_rosservice/test/check_rosservice_command_line_online.py
-@@ -122,7 +122,7 @@ def test_rosservice(self):
- output = Popen([cmd, 'call', name, v], stdout=PIPE).communicate()[0]
- output = output.strip()
- self.assert_(output, output)
-- val = yaml.load(output)['header']
-+ val = yaml.safe_load(output)['header']
- self.assertEquals('', val['frame_id'])
- self.assert_(val['seq'] >= 0)
- self.assertEquals(0, val['stamp']['secs'])
-@@ -131,7 +131,7 @@ def test_rosservice(self):
- # test with auto headers
- for v in ['{header: auto}', '{header: {stamp: now}}']:
- output = Popen([cmd, 'call', name, v], stdout=PIPE).communicate()[0]
-- val = yaml.load(output.strip())['header']
-+ val = yaml.safe_load(output.strip())['header']
- self.assertEquals('', val['frame_id'])
- self.assert_(val['seq'] >= 0)
- self.assert_(val['stamp']['secs'] >= int(t))
diff --git a/dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild b/dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild
deleted file mode 100644
index eb480554239e..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- test? (
- dev-ros/test_rosmaster[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.4.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.4.ebuild
deleted file mode 100644
index 507361ef503e..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.15.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- test? (
- dev-ros/test_rosmaster[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.7.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.7.ebuild
new file mode 100644
index 000000000000..7a943471ee43
--- /dev/null
+++ b/dev-ros/test_rosservice/test_rosservice-1.15.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ test? (
+ dev-ros/test_rosmaster[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ )"
diff --git a/dev-ros/test_rosservice/test_rosservice-9999.ebuild b/dev-ros/test_rosservice/test_rosservice-9999.ebuild
index e11c3e08c1d1..7a943471ee43 100644
--- a/dev-ros/test_rosservice/test_rosservice-9999.ebuild
+++ b/dev-ros/test_rosservice/test_rosservice-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
@@ -9,8 +9,6 @@ ROS_SUBDIR=test/${PN}
CATKIN_HAS_MESSAGES=yes
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-PYTHON_COMPAT=( python2_7 )
-
inherit ros-catkin
DESCRIPTION="Unit tests for rospy"
diff --git a/dev-ros/test_tf2/Manifest b/dev-ros/test_tf2/Manifest
index 350e59889335..460431967299 100644
--- a/dev-ros/test_tf2/Manifest
+++ b/dev-ros/test_tf2/Manifest
@@ -1,10 +1,4 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD test_tf2-0.6.1.ebuild 741 BLAKE2B b7ef0a75c8c15478dff57e2129bba8134152c7c2cb3662f37ffe33d80457f18a66a270bbb72c9b6626085331d196ff59536511432dc2235ec829a62481711d24 SHA512 da448edd248d912e18e51e431510252ffc87f766341cef516fb332ce8dc63ecdac1d3943799c31123c1362045bed1ba108ca5d0489c7a54c677b5d033b9979ea
-EBUILD test_tf2-0.6.2.ebuild 741 BLAKE2B b7ef0a75c8c15478dff57e2129bba8134152c7c2cb3662f37ffe33d80457f18a66a270bbb72c9b6626085331d196ff59536511432dc2235ec829a62481711d24 SHA512 da448edd248d912e18e51e431510252ffc87f766341cef516fb332ce8dc63ecdac1d3943799c31123c1362045bed1ba108ca5d0489c7a54c677b5d033b9979ea
-EBUILD test_tf2-0.6.3.ebuild 741 BLAKE2B b7ef0a75c8c15478dff57e2129bba8134152c7c2cb3662f37ffe33d80457f18a66a270bbb72c9b6626085331d196ff59536511432dc2235ec829a62481711d24 SHA512 da448edd248d912e18e51e431510252ffc87f766341cef516fb332ce8dc63ecdac1d3943799c31123c1362045bed1ba108ca5d0489c7a54c677b5d033b9979ea
-EBUILD test_tf2-0.6.5.ebuild 738 BLAKE2B 437146bf376deae4244d49bebb3335bb9731992e909b7fb6e9228c7f1e3366b5978c8cce5af64f46a25cf904351ac69e97d8e386e7c38522db5fba1503558616 SHA512 59b16e0bb9bc21e0d58e064c16a403f1b94ea5542e08017b76ec5fc219ed482778c640e390e9ebdb094d9f930c1f9ba3e62888480a433d5436b6582a2e8b915e
-EBUILD test_tf2-9999.ebuild 741 BLAKE2B 2913249074a919534e3d42b22cccb6feafae0280339295a6a283cc0992de58225002ac74b26650126f3e203ff74fa8cdacb17b78dbc7bf4ce136d32a414afe43 SHA512 20ba3059bafc461a232c8c94e62e85ca9e38553f9e58a5154e9ce0b7089d5e2a5d1022972289c2de7b4ced6741a95dbff33d076551bd4b0771e60e45f0eebcfd
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD test_tf2-0.7.2.ebuild 710 BLAKE2B 05e12da8e497e862cc4c46dc107a219a27798a0c3598da5ebeda219a1f691a74c0987867ed9a6caeaf25811c9666d2c1559dca88b2c4753d2fc88cb3552fb56d SHA512 3212f780bf6c2ff1d126ea669e6caee43707b252bf1551d5cf36f3b76519040350a22f3c5d126f31805002a6fa31b24ac0b86cee14340e299c0bebb5355af28c
+EBUILD test_tf2-9999.ebuild 710 BLAKE2B 05e12da8e497e862cc4c46dc107a219a27798a0c3598da5ebeda219a1f691a74c0987867ed9a6caeaf25811c9666d2c1559dca88b2c4753d2fc88cb3552fb56d SHA512 3212f780bf6c2ff1d126ea669e6caee43707b252bf1551d5cf36f3b76519040350a22f3c5d126f31805002a6fa31b24ac0b86cee14340e299c0bebb5355af28c
MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/test_tf2/test_tf2-0.6.1.ebuild b/dev-ros/test_tf2/test_tf2-0.6.1.ebuild
deleted file mode 100644
index 9bfecde03150..000000000000
--- a/dev-ros/test_tf2/test_tf2-0.6.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/tf
- dev-ros/tf2
- dev-ros/tf2_bullet
- dev-ros/tf2_ros[${PYTHON_USEDEP}]
- dev-ros/tf2_geometry_msgs[${PYTHON_USEDEP}]
- dev-ros/tf2_kdl[${PYTHON_USEDEP}]
- dev-ros/tf2_msgs
- sci-libs/orocos_kdl
- dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
- dev-libs/boost:=[threads]
- dev-cpp/gtest"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_tf2/test_tf2-0.6.2.ebuild b/dev-ros/test_tf2/test_tf2-0.6.2.ebuild
deleted file mode 100644
index 9bfecde03150..000000000000
--- a/dev-ros/test_tf2/test_tf2-0.6.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/tf
- dev-ros/tf2
- dev-ros/tf2_bullet
- dev-ros/tf2_ros[${PYTHON_USEDEP}]
- dev-ros/tf2_geometry_msgs[${PYTHON_USEDEP}]
- dev-ros/tf2_kdl[${PYTHON_USEDEP}]
- dev-ros/tf2_msgs
- sci-libs/orocos_kdl
- dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
- dev-libs/boost:=[threads]
- dev-cpp/gtest"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_tf2/test_tf2-0.6.3.ebuild b/dev-ros/test_tf2/test_tf2-0.6.3.ebuild
deleted file mode 100644
index 9bfecde03150..000000000000
--- a/dev-ros/test_tf2/test_tf2-0.6.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/tf
- dev-ros/tf2
- dev-ros/tf2_bullet
- dev-ros/tf2_ros[${PYTHON_USEDEP}]
- dev-ros/tf2_geometry_msgs[${PYTHON_USEDEP}]
- dev-ros/tf2_kdl[${PYTHON_USEDEP}]
- dev-ros/tf2_msgs
- sci-libs/orocos_kdl
- dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
- dev-libs/boost:=[threads]
- dev-cpp/gtest"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_tf2/test_tf2-0.6.5.ebuild b/dev-ros/test_tf2/test_tf2-0.6.5.ebuild
deleted file mode 100644
index 3393b751c864..000000000000
--- a/dev-ros/test_tf2/test_tf2-0.6.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/tf
- dev-ros/tf2
- dev-ros/tf2_bullet
- dev-ros/tf2_ros[${PYTHON_USEDEP}]
- dev-ros/tf2_geometry_msgs[${PYTHON_USEDEP}]
- dev-ros/tf2_kdl[${PYTHON_USEDEP}]
- dev-ros/tf2_msgs
- sci-libs/orocos_kdl
- dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
- dev-libs/boost:=[threads]
- dev-cpp/gtest"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_tf2/test_tf2-0.7.2.ebuild b/dev-ros/test_tf2/test_tf2-0.7.2.ebuild
new file mode 100644
index 000000000000..c69d1b425fba
--- /dev/null
+++ b/dev-ros/test_tf2/test_tf2-0.7.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 unit tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+ dev-ros/rosconsole
+ dev-ros/roscpp
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-ros/tf
+ dev-ros/tf2
+ dev-ros/tf2_bullet
+ dev-ros/tf2_ros[${PYTHON_USEDEP}]
+ dev-ros/tf2_geometry_msgs[${PYTHON_USEDEP}]
+ dev-ros/tf2_kdl[${PYTHON_USEDEP}]
+ dev-ros/tf2_msgs
+ sci-libs/orocos_kdl
+ dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+ dev-libs/boost:=[threads]
+ dev-cpp/gtest"
+
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_tf2/test_tf2-9999.ebuild b/dev-ros/test_tf2/test_tf2-9999.ebuild
index 4378c07e804e..c69d1b425fba 100644
--- a/dev-ros/test_tf2/test_tf2-9999.ebuild
+++ b/dev-ros/test_tf2/test_tf2-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/geometry2"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/tf/Manifest b/dev-ros/tf/Manifest
index b7c6a63fa00b..600e62d080e1 100644
--- a/dev-ros/tf/Manifest
+++ b/dev-ros/tf/Manifest
@@ -1,5 +1,4 @@
-AUX boost.patch 974 BLAKE2B 77e8a170d7d6dcec9e41e32443abf512d735c0cbb82bc160883e14dad45136818fbe47e34813bf7abe328fca4549c92b5c1041c83a33a5ea63145abb1e8f9431 SHA512 272b7ea812a7a65d415fb8dc845f23cb969391a10e5035b759e48f1fe31466248ffece658f2323a3e3e0ce6b7bfef6ae6e4d0014e8a8a926755e98a9c96783fc
-DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
-EBUILD tf-1.12.0.ebuild 1041 BLAKE2B bafd8e43f109f7127ce19e48a0d31e44ab91b8027ef02c0c7b86ba0159671ffca727c701e38844e6694c2313de3bd5655a9c94fe9780260507c8c1e35a3643b2 SHA512 8ec179d1f944810777444059a15c395be28c2329c7600d8696f3c99ca56e1d1edf09de48010cab9c05265c346e3dd6afeb95a2f188e6fe1954fee0de3dfa3275
-EBUILD tf-9999.ebuild 1006 BLAKE2B 67006c1c0fc77a0449be9d829464d1efad49aa0e503d96df900e3c288350dd1d140fd2b22bdd76eaa6e3973ef83642251c2ef3218f02492e6d637e903992983e SHA512 980971c39495ef9679810efa1cce7ac029ea92b2fe09031a8dd52d346c37770caf5717641d548b200b42dbce2b4c21dd64d3363794e3fd904c441753fcbd65ac
+DIST geometry-1.13.2.tar.gz 188225 BLAKE2B b08e78b298c94c38baa5d25a878be703d7d3a310277b66690b9fe4da1d0cd3f9083cf3bf6dc1d59149599b6fb0ec10feaf668206da245ed7e0cb9cf1878b620c SHA512 504de0e7ebf1dd73e918ab4fa39967cc9e39a53d487072430106b391d669ddfc7e530b66b38f4f73d1787e4a73acdad8e707c6757afe2e235157d4aa19f28af2
+EBUILD tf-1.13.2.ebuild 1003 BLAKE2B 0d969be3dec4281f658f9aad9b425c129f7fb2ed857a2d899123e286507b8198202151acc688d033ea3a8d028a3e23277016aaa38b557c04b79a3917a6a11fbb SHA512 fa18e79febc5739ef4ebe5fb8c92c6720a96eed69ef816dacbb57218277cb6a6465f367b042da031899d0b42dab401c2458e398f233487b587f407e2c4390fe9
+EBUILD tf-9999.ebuild 1003 BLAKE2B 0d969be3dec4281f658f9aad9b425c129f7fb2ed857a2d899123e286507b8198202151acc688d033ea3a8d028a3e23277016aaa38b557c04b79a3917a6a11fbb SHA512 fa18e79febc5739ef4ebe5fb8c92c6720a96eed69ef816dacbb57218277cb6a6465f367b042da031899d0b42dab401c2458e398f233487b587f407e2c4390fe9
MISC metadata.xml 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/tf/files/boost.patch b/dev-ros/tf/files/boost.patch
deleted file mode 100644
index dd926cf05848..000000000000
--- a/dev-ros/tf/files/boost.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2eed72cb7b63fc4ee98af695c625d9a741a09897 Mon Sep 17 00:00:00 2001
-From: Maarten de Vries
-Date: Thu, 17 Jan 2019 21:40:28 +0100
-Subject: [PATCH] Remove `signals` from find_package(Boost COMPONENTS ...)
-
-tf is using signals2, which is not the same library as signals.
-Additionally, signals2 has always been header only, and header only
-libraries must not be listed in find_package.
-
-Boost 1.69 removed the old signals library entirely, so the otherwise
-useless `COMPONENTS signals` actually breaks the build.
----
- tf/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tf/CMakeLists.txt b/tf/CMakeLists.txt
-index 04dcb4e8..b469f658 100644
---- a/tf/CMakeLists.txt
-+++ b/tf/CMakeLists.txt
-@@ -15,7 +15,7 @@ find_package(catkin REQUIRED COMPONENTS
- std_msgs
- tf2_ros
- )
--find_package(Boost REQUIRED COMPONENTS thread signals system)
-+find_package(Boost REQUIRED COMPONENTS thread system)
-
- catkin_python_setup()
-
diff --git a/dev-ros/tf/tf-1.12.0.ebuild b/dev-ros/tf/tf-1.12.0.ebuild
deleted file mode 100644
index 201cf57ee6b6..000000000000
--- a/dev-ros/tf/tf-1.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Maintains the relationship between coordinate frames in a tree structure buffered in time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/boost:=[threads]
- dev-ros/angles
- dev-ros/message_filters
- dev-ros/rosconsole
- dev-ros/rostime
- dev-ros/roscpp
- dev-ros/tf2_ros
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-cpp/gtest
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-PATCHES=( "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/tf/tf-1.13.2.ebuild b/dev-ros/tf/tf-1.13.2.ebuild
new file mode 100644
index 000000000000..bc00316e3c8b
--- /dev/null
+++ b/dev-ros/tf/tf-1.13.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Maintains the relationship between frames in a tree structure over time"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-ros/angles
+ dev-ros/message_filters
+ dev-ros/rosconsole
+ dev-ros/rostime
+ dev-ros/roscpp
+ dev-ros/tf2_ros
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-python/rospkg[${PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ test? (
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-cpp/gtest
+ dev-python/nose[${PYTHON_USEDEP}]
+ )"
diff --git a/dev-ros/tf/tf-9999.ebuild b/dev-ros/tf/tf-9999.ebuild
index 8268c23d3c0d..bc00316e3c8b 100644
--- a/dev-ros/tf/tf-9999.ebuild
+++ b/dev-ros/tf/tf-9999.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/geometry"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="Maintains the relationship between coordinate frames in a tree structure buffered in time"
+DESCRIPTION="Maintains the relationship between frames in a tree structure over time"
LICENSE="BSD"
SLOT="0"
IUSE=""
@@ -26,11 +25,13 @@ RDEPEND="
dev-ros/rospy[${PYTHON_USEDEP}]
dev-ros/roslib[${PYTHON_USEDEP}]
dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? (
dev-ros/rostest[${PYTHON_USEDEP}]
dev-cpp/gtest
diff --git a/dev-ros/tf2/Manifest b/dev-ros/tf2/Manifest
index c133031f2197..5deae3262582 100644
--- a/dev-ros/tf2/Manifest
+++ b/dev-ros/tf2/Manifest
@@ -1,5 +1,4 @@
-AUX boost.patch 958 BLAKE2B 0d75e27281700e0408bbc3132b6fea851e76cfc06b0e9fe7da2911675875e5779cb9aa485539cdfad3e3f812e7711546f0e7c468f964f54a5a0c5ee5c58e5bd5 SHA512 d2f776bfd87fe3b22303b3e7fa5e7a7cf1bc59330ba6d16760172786c3119eb42dde925aa3f7ce04423c1c2cdf6b0fedbe05aeab8d983585e6fd3103996751dc
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2-0.6.5-r1.ebuild 585 BLAKE2B a01271211102fe8762c2c0d222d1e00b3776427cf539965ef113745fd808968763458799130890f87d9fd40f873711070885d1bf76eab1d4a3640dd0244f3001 SHA512 65bf35a70d1a20039f4c8535ca98a54bb85b58e9ff67588921f581634d549460dc1301bf31f34ed8a633f2cd81cb06ff8ac09ecf14a7b7ea7d7af53face432e9
-EBUILD tf2-9999.ebuild 550 BLAKE2B 10c50cfb412755a1c9ca026c2343da67ebdd73a2d9b9eb3697d7d87ca3a167e7f02008cd1f55c6cea8129b162d32c0277ddadfe07dc814a8359e0366f4013121 SHA512 f90dce47cd2d78d2de07c1bfc8da8e17865fe4c3e76313efc8751be397e2892a4df61a10de60eb875309ae9db9c20cd6700a72540cbeb49e303a297d830281b4
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2-0.7.2.ebuild 547 BLAKE2B c96f4b6df178c6d34f83f8a9346926b96dd902ef25ec532a8c59289a86c677a475cf3ea12dcdfac99086a44e9d78cb5ffa15833452554af84995a831350d3f77 SHA512 cf7de5d5e0a93892517a9d660f9b4692b45fb7bdce7fe2c42be8120e60f1ebeb59e1f0a7835c9db35fa3e7131b488ed4aaf0362202d083f5d2e933b01611f2ba
+EBUILD tf2-9999.ebuild 547 BLAKE2B c96f4b6df178c6d34f83f8a9346926b96dd902ef25ec532a8c59289a86c677a475cf3ea12dcdfac99086a44e9d78cb5ffa15833452554af84995a831350d3f77 SHA512 cf7de5d5e0a93892517a9d660f9b4692b45fb7bdce7fe2c42be8120e60f1ebeb59e1f0a7835c9db35fa3e7131b488ed4aaf0362202d083f5d2e933b01611f2ba
MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2/files/boost.patch b/dev-ros/tf2/files/boost.patch
deleted file mode 100644
index 5f87149ee31e..000000000000
--- a/dev-ros/tf2/files/boost.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 6223549e4d5e1d442a9cfb8e8c7334bcc62c1662
-Author: Maarten de Vries
-Date: Thu Jan 17 16:00:14 2019 +0100
-
- Remove `signals` from find_package(Boost COMPONENTS ...).
-
- tf2 is using signals2, which is not the same library.
- Additionally, signals2 has always been header only, and header only
- libraries must not be listed in find_package.
-
- Boost 1.69 removed the old signals library entirely, so the otherwise
- useless `COMPONENTS signals` actually breaks the build.
-
-diff --git a/tf2/CMakeLists.txt b/tf2/CMakeLists.txt
-index 9ffb17a..7a6da34 100644
---- a/tf2/CMakeLists.txt
-+++ b/tf2/CMakeLists.txt
-@@ -3,7 +3,7 @@ project(tf2)
-
- find_package(console_bridge REQUIRED)
- find_package(catkin REQUIRED COMPONENTS geometry_msgs rostime tf2_msgs)
--find_package(Boost REQUIRED COMPONENTS signals system thread)
-+find_package(Boost REQUIRED COMPONENTS system thread)
-
- catkin_package(
- INCLUDE_DIRS include
diff --git a/dev-ros/tf2/tf2-0.6.5-r1.ebuild b/dev-ros/tf2/tf2-0.6.5-r1.ebuild
deleted file mode 100644
index 826acc9420ad..000000000000
--- a/dev-ros/tf2/tf2-0.6.5-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/console_bridge:=
- dev-ros/rostime
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/roscpp )
-"
-PATCHES=( "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/tf2/tf2-0.7.2.ebuild b/dev-ros/tf2/tf2-0.7.2.ebuild
new file mode 100644
index 000000000000..d23f7f7868f4
--- /dev/null
+++ b/dev-ros/tf2/tf2-0.7.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="The second generation Transform Library in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/console_bridge:=
+ dev-ros/rostime
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+ dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ test? ( dev-ros/roscpp )
+"
diff --git a/dev-ros/tf2/tf2-9999.ebuild b/dev-ros/tf2/tf2-9999.ebuild
index 5c97f8328efe..d23f7f7868f4 100644
--- a/dev-ros/tf2/tf2-9999.ebuild
+++ b/dev-ros/tf2/tf2-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/geometry2"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
@@ -14,12 +14,12 @@ SLOT="0"
IUSE=""
RDEPEND="
- dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-libs/console_bridge:=
dev-ros/rostime
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-libs/boost:=[threads]
"
DEPEND="${RDEPEND}
+ dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? ( dev-ros/roscpp )
"
diff --git a/dev-ros/tf2_bullet/Manifest b/dev-ros/tf2_bullet/Manifest
index b25fdf34d11c..e5daa703f944 100644
--- a/dev-ros/tf2_bullet/Manifest
+++ b/dev-ros/tf2_bullet/Manifest
@@ -1,10 +1,4 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_bullet-0.6.1.ebuild 403 BLAKE2B 82c635f27e043327f7d158193ac5f8c438c676fe9cd30c956542454ca394061ab9c843ac019bab431c1cac7aa24f2e5a6fe1ab069707b0eeb13aed93c3a3e111 SHA512 7f566040c785caef269f23555d183c4c7a3dae5bcff0cf0d9cc4d6a4d18c782fbe68d7134b0b81d7c132129f67ad64800c90ef3dbc67b5263c54bdb3372ab82f
-EBUILD tf2_bullet-0.6.2.ebuild 403 BLAKE2B 82c635f27e043327f7d158193ac5f8c438c676fe9cd30c956542454ca394061ab9c843ac019bab431c1cac7aa24f2e5a6fe1ab069707b0eeb13aed93c3a3e111 SHA512 7f566040c785caef269f23555d183c4c7a3dae5bcff0cf0d9cc4d6a4d18c782fbe68d7134b0b81d7c132129f67ad64800c90ef3dbc67b5263c54bdb3372ab82f
-EBUILD tf2_bullet-0.6.3.ebuild 403 BLAKE2B 82c635f27e043327f7d158193ac5f8c438c676fe9cd30c956542454ca394061ab9c843ac019bab431c1cac7aa24f2e5a6fe1ab069707b0eeb13aed93c3a3e111 SHA512 7f566040c785caef269f23555d183c4c7a3dae5bcff0cf0d9cc4d6a4d18c782fbe68d7134b0b81d7c132129f67ad64800c90ef3dbc67b5263c54bdb3372ab82f
-EBUILD tf2_bullet-0.6.5.ebuild 400 BLAKE2B 57ddf9be31ec0d99baa695fe01d2b5e3b1cda75ea399929d14cc7108d8bdce5c95eb8bf35151b19fe068a967ef88cea59d25fe82844956e06f83dc8e2839cbb7 SHA512 0dd840841ab016e1dec4314d528d1437c1f64bd08ec17a83ab169689d28871b9f04ff520eb48da00d2874821d86b08cae75bab2ca7e0004e64b0ed9031950286
-EBUILD tf2_bullet-9999.ebuild 403 BLAKE2B 5cd722d732fcbda57a1712a1154c25c7ca071a7f9f98bad333f88ba9bbce875f96c06c6d5174e2da844aefd5592b2010dbbedd501599afd10c8639e4c0726249 SHA512 cb8dc5dde03d9a367af2b78fe5e9a06477703a019b0f3229faac68df0ba1b11313af9d0fce4751202a5302c25373405c616b5a67a0625bb105638f2a038c1a96
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_bullet-0.7.2.ebuild 401 BLAKE2B e6b9ebeb474ccd2e25ec9784ddaec86bee56b6e73c02f57a6f6c648e557a26bf6838ad01f730380070f9c2daca2be5445114487b5fde718d4b1f59a73492b34d SHA512 ff073053fcc220f4d550fb17eee0fa5d713a5c88630740d66d3ae5d3a26a3261b9133ee6ca5033b109e751a5d839a3cd19a246a6e4a7e2ca76c5ac8d1d73fa5f
+EBUILD tf2_bullet-9999.ebuild 401 BLAKE2B e6b9ebeb474ccd2e25ec9784ddaec86bee56b6e73c02f57a6f6c648e557a26bf6838ad01f730380070f9c2daca2be5445114487b5fde718d4b1f59a73492b34d SHA512 ff073053fcc220f4d550fb17eee0fa5d713a5c88630740d66d3ae5d3a26a3261b9133ee6ca5033b109e751a5d839a3cd19a246a6e4a7e2ca76c5ac8d1d73fa5f
MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.6.1.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.6.1.ebuild
deleted file mode 100644
index cff2733f7c12..000000000000
--- a/dev-ros/tf2_bullet/tf2_bullet-0.6.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 bullet support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/tf2
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- sci-physics/bullet
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.6.2.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.6.2.ebuild
deleted file mode 100644
index cff2733f7c12..000000000000
--- a/dev-ros/tf2_bullet/tf2_bullet-0.6.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 bullet support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/tf2
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- sci-physics/bullet
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.6.3.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.6.3.ebuild
deleted file mode 100644
index cff2733f7c12..000000000000
--- a/dev-ros/tf2_bullet/tf2_bullet-0.6.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 bullet support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/tf2
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- sci-physics/bullet
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.6.5.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.6.5.ebuild
deleted file mode 100644
index 86fbb798b406..000000000000
--- a/dev-ros/tf2_bullet/tf2_bullet-0.6.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 bullet support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/tf2
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- sci-physics/bullet
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.7.2.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.7.2.ebuild
new file mode 100644
index 000000000000..d67e78479dc9
--- /dev/null
+++ b/dev-ros/tf2_bullet/tf2_bullet-0.7.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 bullet support"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf2
+ sci-physics/bullet
+"
+DEPEND="${RDEPEND}
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/tf2_bullet/tf2_bullet-9999.ebuild b/dev-ros/tf2_bullet/tf2_bullet-9999.ebuild
index 0e3481aa549f..d67e78479dc9 100644
--- a/dev-ros/tf2_bullet/tf2_bullet-9999.ebuild
+++ b/dev-ros/tf2_bullet/tf2_bullet-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/geometry2"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
@@ -15,7 +15,8 @@ IUSE=""
RDEPEND="
dev-ros/tf2
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
sci-physics/bullet
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/tf2_eigen/Manifest b/dev-ros/tf2_eigen/Manifest
index 57a9695c6e6b..eef863b122c0 100644
--- a/dev-ros/tf2_eigen/Manifest
+++ b/dev-ros/tf2_eigen/Manifest
@@ -1,10 +1,4 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_eigen-0.6.1.ebuild 426 BLAKE2B 396fa885cab72c2e60ef49db22e97cabf953a0178955c1e12e88362589d5201a9e77401af867a19946cd6287795812cc5d9d78f21781cb22979c3676c446fcfe SHA512 4c19f01cae4b2c61db270a34a5ee284fbc838e86451b9a66c7da93d9eba1fd605ff862960556d02f707cc9f1a0ce568c7e4965bd7dc9ed4f20783962f869be7f
-EBUILD tf2_eigen-0.6.2.ebuild 426 BLAKE2B 396fa885cab72c2e60ef49db22e97cabf953a0178955c1e12e88362589d5201a9e77401af867a19946cd6287795812cc5d9d78f21781cb22979c3676c446fcfe SHA512 4c19f01cae4b2c61db270a34a5ee284fbc838e86451b9a66c7da93d9eba1fd605ff862960556d02f707cc9f1a0ce568c7e4965bd7dc9ed4f20783962f869be7f
-EBUILD tf2_eigen-0.6.3.ebuild 426 BLAKE2B 396fa885cab72c2e60ef49db22e97cabf953a0178955c1e12e88362589d5201a9e77401af867a19946cd6287795812cc5d9d78f21781cb22979c3676c446fcfe SHA512 4c19f01cae4b2c61db270a34a5ee284fbc838e86451b9a66c7da93d9eba1fd605ff862960556d02f707cc9f1a0ce568c7e4965bd7dc9ed4f20783962f869be7f
-EBUILD tf2_eigen-0.6.5.ebuild 423 BLAKE2B d48592baeaa164bf98014e191bc5caf43162f28241c787bd532e4dae273b6ce6f50ff84c7e38ea002c34237db8f82c79167256eab52039e6786b212be23a5de6 SHA512 33800d7cef32b4ec75a7e32e1af72acd94a9d1d9e2cbaf6ff79705114860af5f091e365a34b147a10cad4a5ac843948f65042d4cb335a55a34c1b7c11abf0d8f
-EBUILD tf2_eigen-9999.ebuild 426 BLAKE2B ad08ef9dcc12fbc23f846f04e65cd59d2826b99441a05f55ea4cce8c8686956ef3ebd15dfdbd7999de9a89c4c34bdb9476119869dc0213194366735fee2c4828 SHA512 59af992a1e2c160faa74d9f9c7ad06cc95ef4726062726044865da407147e92e0fca5eb32a4b5261d35fbe61288de6d78f1813ebf124a6a2a741cd6219e36774
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_eigen-0.7.2.ebuild 425 BLAKE2B d9862b2fba1a774982ddfcf6cdfd5b86abc5898d28db55ee09ba76929de0e464102ca0c6cfebc7476cb30f24a7850bb0d418d304aac08c27e5d8cc8826f47272 SHA512 2b04753ca2ff23f6db037838eb86a6c7e6585fe193446fa23d7a6e4c37152ad659a819c827fb1f49e40cebabd350b1c797051e19b297f0358587ee4dfe1d86cc
+EBUILD tf2_eigen-9999.ebuild 425 BLAKE2B d9862b2fba1a774982ddfcf6cdfd5b86abc5898d28db55ee09ba76929de0e464102ca0c6cfebc7476cb30f24a7850bb0d418d304aac08c27e5d8cc8826f47272 SHA512 2b04753ca2ff23f6db037838eb86a6c7e6585fe193446fa23d7a6e4c37152ad659a819c827fb1f49e40cebabd350b1c797051e19b297f0358587ee4dfe1d86cc
MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.6.1.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.6.1.ebuild
deleted file mode 100644
index b3071940cfb2..000000000000
--- a/dev-ros/tf2_eigen/tf2_eigen-0.6.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 eigen support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-ros/tf2
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND} dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.6.2.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.6.2.ebuild
deleted file mode 100644
index b3071940cfb2..000000000000
--- a/dev-ros/tf2_eigen/tf2_eigen-0.6.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 eigen support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-ros/tf2
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND} dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.6.3.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.6.3.ebuild
deleted file mode 100644
index b3071940cfb2..000000000000
--- a/dev-ros/tf2_eigen/tf2_eigen-0.6.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 eigen support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-ros/tf2
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND} dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.6.5.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.6.5.ebuild
deleted file mode 100644
index b5911e90e380..000000000000
--- a/dev-ros/tf2_eigen/tf2_eigen-0.6.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 eigen support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-ros/tf2
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND} dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.7.2.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.7.2.ebuild
new file mode 100644
index 000000000000..61caabd74581
--- /dev/null
+++ b/dev-ros/tf2_eigen/tf2_eigen-0.7.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 eigen support"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf2
+"
+DEPEND="${RDEPEND}
+ dev-ros/cmake_modules
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-cpp/eigen:3
+"
diff --git a/dev-ros/tf2_eigen/tf2_eigen-9999.ebuild b/dev-ros/tf2_eigen/tf2_eigen-9999.ebuild
index ebd5b24c7e79..61caabd74581 100644
--- a/dev-ros/tf2_eigen/tf2_eigen-9999.ebuild
+++ b/dev-ros/tf2_eigen/tf2_eigen-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/geometry2"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
@@ -14,8 +14,10 @@ SLOT="0"
IUSE=""
RDEPEND="
- dev-cpp/eigen:3
dev-ros/tf2
+"
+DEPEND="${RDEPEND}
+ dev-ros/cmake_modules
dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-cpp/eigen:3
"
-DEPEND="${RDEPEND} dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_geometry_msgs/Manifest b/dev-ros/tf2_geometry_msgs/Manifest
index 5d7a0a77288a..935b900432e8 100644
--- a/dev-ros/tf2_geometry_msgs/Manifest
+++ b/dev-ros/tf2_geometry_msgs/Manifest
@@ -1,6 +1,4 @@
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_geometry_msgs-0.6.3.ebuild 638 BLAKE2B 6ce8934bf2a57cd0723479bdecfede5615e77f6923ebacb7f767b37f6378baae9e039ebb792b0d7adb53c61bbb0bde932860c2d1d2ad42ac5ffb13b55bfc7bcf SHA512 b928127878e9d9447150c66bd796b208a45d7c05d80ec4fd21782ea727c18f9691a936ae1896c4396186cf0dcd4b79312dbe299e2d76c3265501b4648db95d94
-EBUILD tf2_geometry_msgs-0.6.5.ebuild 635 BLAKE2B 11238529a63e1bfbd7045eca08d8ad988ad9ababb6818c52d62e7110838943d2950ee69df73067fcbb938f91d920bdd130fb2ce2b3bd5552dab6dc04093b7b38 SHA512 2466bdd2e31724927e6f4b143457264ab591782a1292c40ff019b1a99c2bdc49159613eb010850ce38424d1393522f2d4d0ec6a0d68d8981998edf6c067b58c3
-EBUILD tf2_geometry_msgs-9999.ebuild 638 BLAKE2B 6ce8934bf2a57cd0723479bdecfede5615e77f6923ebacb7f767b37f6378baae9e039ebb792b0d7adb53c61bbb0bde932860c2d1d2ad42ac5ffb13b55bfc7bcf SHA512 b928127878e9d9447150c66bd796b208a45d7c05d80ec4fd21782ea727c18f9691a936ae1896c4396186cf0dcd4b79312dbe299e2d76c3265501b4648db95d94
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_geometry_msgs-0.7.2.ebuild 632 BLAKE2B 39ad679183c1c7e5f9ad02cafe825da2592e2b864934495a66c231c9dc49c080a8b5e0eb7f8905df0b861e0164d3ea335003c0388498c4683310f02c94ade041 SHA512 c3138ed888bf5798132b4ba147fbb9e9b8bd69f35478348850d9b11d3a4ec17047e09ce427d735aa4d9466a2c6336bcd654fe6c0876f9a89f87d1f400999cb25
+EBUILD tf2_geometry_msgs-9999.ebuild 632 BLAKE2B 39ad679183c1c7e5f9ad02cafe825da2592e2b864934495a66c231c9dc49c080a8b5e0eb7f8905df0b861e0164d3ea335003c0388498c4683310f02c94ade041 SHA512 c3138ed888bf5798132b4ba147fbb9e9b8bd69f35478348850d9b11d3a4ec17047e09ce427d735aa4d9466a2c6336bcd654fe6c0876f9a89f87d1f400999cb25
MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.3.ebuild b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.3.ebuild
deleted file mode 100644
index 244de1604706..000000000000
--- a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf2_ros[${PYTHON_USEDEP}]
- dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
- dev-ros/tf2
- sci-libs/orocos_kdl
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.5.ebuild b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.5.ebuild
deleted file mode 100644
index a15156ecb52e..000000000000
--- a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf2_ros[${PYTHON_USEDEP}]
- dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
- dev-ros/tf2
- sci-libs/orocos_kdl
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.2.ebuild b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.2.ebuild
new file mode 100644
index 000000000000..c6f1c370e9c1
--- /dev/null
+++ b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="The second generation Transform Library in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf2_ros[${PYTHON_USEDEP}]
+ dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+ dev-ros/tf2
+ sci-libs/orocos_kdl
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-9999.ebuild b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-9999.ebuild
index 244de1604706..c6f1c370e9c1 100644
--- a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-9999.ebuild
+++ b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/geometry2"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
CATKIN_HAS_MESSAGES=yes
inherit ros-catkin
@@ -21,6 +20,8 @@ RDEPEND="
dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
dev-ros/tf2
sci-libs/orocos_kdl
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_kdl/Manifest b/dev-ros/tf2_kdl/Manifest
index 3e96e51085e1..50022b52a8d2 100644
--- a/dev-ros/tf2_kdl/Manifest
+++ b/dev-ros/tf2_kdl/Manifest
@@ -1,10 +1,4 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_kdl-0.6.1-r1.ebuild 591 BLAKE2B 9ce143f43d01ff78ca37af92c50a5387a4cab0a83804813f28a6c6516283ee92585eb0ed4b3877c2065741d11db5203f2d9cdca55cbfac015dd8e2b69d584469 SHA512 33682a91446fde1fcada6ecf7b5d0ee3f140b1a32b91c004c126bf50c6696479d185d85cb5e3a7577d70563b5b700fabc56639b7df3e06aded57978f6113a4ee
-EBUILD tf2_kdl-0.6.2.ebuild 591 BLAKE2B 9ce143f43d01ff78ca37af92c50a5387a4cab0a83804813f28a6c6516283ee92585eb0ed4b3877c2065741d11db5203f2d9cdca55cbfac015dd8e2b69d584469 SHA512 33682a91446fde1fcada6ecf7b5d0ee3f140b1a32b91c004c126bf50c6696479d185d85cb5e3a7577d70563b5b700fabc56639b7df3e06aded57978f6113a4ee
-EBUILD tf2_kdl-0.6.3.ebuild 591 BLAKE2B 9ce143f43d01ff78ca37af92c50a5387a4cab0a83804813f28a6c6516283ee92585eb0ed4b3877c2065741d11db5203f2d9cdca55cbfac015dd8e2b69d584469 SHA512 33682a91446fde1fcada6ecf7b5d0ee3f140b1a32b91c004c126bf50c6696479d185d85cb5e3a7577d70563b5b700fabc56639b7df3e06aded57978f6113a4ee
-EBUILD tf2_kdl-0.6.5.ebuild 588 BLAKE2B 4b10b7c9328918eacc47fbfbbc0299828c2ad26dd32e93a1799f935d4cdc808e8e74bf7d52d8280e92a151f83a2d908eea7bb471114fa18cc0c40195871f3241 SHA512 4fa0f5d8c3108e4969ddf10c7db4117cc37a76d2f770564bb42e938bae69b5281a297b03ec6540b233f80362183f0cca37ca5470d3e95754bbb087532bd130da
-EBUILD tf2_kdl-9999.ebuild 591 BLAKE2B 9ce143f43d01ff78ca37af92c50a5387a4cab0a83804813f28a6c6516283ee92585eb0ed4b3877c2065741d11db5203f2d9cdca55cbfac015dd8e2b69d584469 SHA512 33682a91446fde1fcada6ecf7b5d0ee3f140b1a32b91c004c126bf50c6696479d185d85cb5e3a7577d70563b5b700fabc56639b7df3e06aded57978f6113a4ee
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_kdl-0.7.2.ebuild 560 BLAKE2B 8f5e6e6cf90ae2775970df21c41951a9f4a72b39851c1d89d960f550f6ee2f431b128dd1e29dd9066671320b05ac975512edc3939584b07d0b809055613beef7 SHA512 d4fce37cda2bc2ab8c94fde688d944c426fd47bda53f346d2fba331341f0a3735770689ef195f9e9b63653d23078401f0d13707b1752ec7508d5dafed180fb50
+EBUILD tf2_kdl-9999.ebuild 560 BLAKE2B 8f5e6e6cf90ae2775970df21c41951a9f4a72b39851c1d89d960f550f6ee2f431b128dd1e29dd9066671320b05ac975512edc3939584b07d0b809055613beef7 SHA512 d4fce37cda2bc2ab8c94fde688d944c426fd47bda53f346d2fba331341f0a3735770689ef195f9e9b63653d23078401f0d13707b1752ec7508d5dafed180fb50
MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.6.1-r1.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.6.1-r1.ebuild
deleted file mode 100644
index e5c441b6527d..000000000000
--- a/dev-ros/tf2_kdl/tf2_kdl-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="KDL binding for tf2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-ros/tf2
- dev-ros/tf2_ros
- dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
- sci-libs/orocos_kdl:=
- dev-ros/tf2_msgs[${PYTHON_USEDEP}]
- dev-ros/cmake_modules
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-cpp/gtest
- )"
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.6.2.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.6.2.ebuild
deleted file mode 100644
index e5c441b6527d..000000000000
--- a/dev-ros/tf2_kdl/tf2_kdl-0.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="KDL binding for tf2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-ros/tf2
- dev-ros/tf2_ros
- dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
- sci-libs/orocos_kdl:=
- dev-ros/tf2_msgs[${PYTHON_USEDEP}]
- dev-ros/cmake_modules
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-cpp/gtest
- )"
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.6.3.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.6.3.ebuild
deleted file mode 100644
index e5c441b6527d..000000000000
--- a/dev-ros/tf2_kdl/tf2_kdl-0.6.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="KDL binding for tf2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-ros/tf2
- dev-ros/tf2_ros
- dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
- sci-libs/orocos_kdl:=
- dev-ros/tf2_msgs[${PYTHON_USEDEP}]
- dev-ros/cmake_modules
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-cpp/gtest
- )"
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.6.5.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.6.5.ebuild
deleted file mode 100644
index 058bb5798fb7..000000000000
--- a/dev-ros/tf2_kdl/tf2_kdl-0.6.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="KDL binding for tf2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-ros/tf2
- dev-ros/tf2_ros
- dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
- sci-libs/orocos_kdl:=
- dev-ros/tf2_msgs[${PYTHON_USEDEP}]
- dev-ros/cmake_modules
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-cpp/gtest
- )"
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.7.2.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.7.2.ebuild
new file mode 100644
index 000000000000..3f5e37e6f6e7
--- /dev/null
+++ b/dev-ros/tf2_kdl/tf2_kdl-0.7.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="KDL binding for tf2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf2
+ dev-ros/tf2_ros
+ dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+ sci-libs/orocos_kdl:=
+ dev-ros/tf2_msgs[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-ros/cmake_modules
+ dev-cpp/eigen:3
+ test? (
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-cpp/gtest
+ )"
diff --git a/dev-ros/tf2_kdl/tf2_kdl-9999.ebuild b/dev-ros/tf2_kdl/tf2_kdl-9999.ebuild
index e5c441b6527d..3f5e37e6f6e7 100644
--- a/dev-ros/tf2_kdl/tf2_kdl-9999.ebuild
+++ b/dev-ros/tf2_kdl/tf2_kdl-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/geometry2"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -15,15 +14,15 @@ SLOT="0"
IUSE=""
RDEPEND="
- dev-cpp/eigen:3
dev-ros/tf2
dev-ros/tf2_ros
dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
sci-libs/orocos_kdl:=
dev-ros/tf2_msgs[${PYTHON_USEDEP}]
- dev-ros/cmake_modules
"
DEPEND="${RDEPEND}
+ dev-ros/cmake_modules
+ dev-cpp/eigen:3
test? (
dev-ros/rostest[${PYTHON_USEDEP}]
dev-cpp/gtest
diff --git a/dev-ros/tf2_msgs/Manifest b/dev-ros/tf2_msgs/Manifest
index 031df58c234e..774a42cd4733 100644
--- a/dev-ros/tf2_msgs/Manifest
+++ b/dev-ros/tf2_msgs/Manifest
@@ -1,10 +1,4 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_msgs-0.6.1.ebuild 442 BLAKE2B d6a3c2819d577619680bcdc2d3b4518a0c91489b139882e2689885ff40e1c1b7b6639e95b39b357fa5a9539d339bd3b9c8d05ecbff2f2751206028c2903c978c SHA512 ecddeabb736c034df09b0895da2570ba150658c9d010c6cd0198a5808ad5ba80294e4f36593538f1e4976e3a248061efc7047af37b1ad8ad4757aa0b211488a5
-EBUILD tf2_msgs-0.6.2.ebuild 442 BLAKE2B d6a3c2819d577619680bcdc2d3b4518a0c91489b139882e2689885ff40e1c1b7b6639e95b39b357fa5a9539d339bd3b9c8d05ecbff2f2751206028c2903c978c SHA512 ecddeabb736c034df09b0895da2570ba150658c9d010c6cd0198a5808ad5ba80294e4f36593538f1e4976e3a248061efc7047af37b1ad8ad4757aa0b211488a5
-EBUILD tf2_msgs-0.6.3.ebuild 442 BLAKE2B d6a3c2819d577619680bcdc2d3b4518a0c91489b139882e2689885ff40e1c1b7b6639e95b39b357fa5a9539d339bd3b9c8d05ecbff2f2751206028c2903c978c SHA512 ecddeabb736c034df09b0895da2570ba150658c9d010c6cd0198a5808ad5ba80294e4f36593538f1e4976e3a248061efc7047af37b1ad8ad4757aa0b211488a5
-EBUILD tf2_msgs-0.6.5.ebuild 442 BLAKE2B d6a3c2819d577619680bcdc2d3b4518a0c91489b139882e2689885ff40e1c1b7b6639e95b39b357fa5a9539d339bd3b9c8d05ecbff2f2751206028c2903c978c SHA512 ecddeabb736c034df09b0895da2570ba150658c9d010c6cd0198a5808ad5ba80294e4f36593538f1e4976e3a248061efc7047af37b1ad8ad4757aa0b211488a5
-EBUILD tf2_msgs-9999.ebuild 442 BLAKE2B d6a3c2819d577619680bcdc2d3b4518a0c91489b139882e2689885ff40e1c1b7b6639e95b39b357fa5a9539d339bd3b9c8d05ecbff2f2751206028c2903c978c SHA512 ecddeabb736c034df09b0895da2570ba150658c9d010c6cd0198a5808ad5ba80294e4f36593538f1e4976e3a248061efc7047af37b1ad8ad4757aa0b211488a5
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_msgs-0.7.2.ebuild 414 BLAKE2B 8bd31f8ab8712c9834a05050f16076cc57a15a8f4570d229591da065c3faa658cb3ba1eda92feb314bbe4c2efe498086b5f2a6ea776c6346a939bb9ed59f509a SHA512 b086610badf63d44fb9508fa2a0dc5afb3b617053991ec5dc87672088b94818b0a3272ee6e4f9acdfff269147dda2987d630f1427567159f3558985f8f3f1663
+EBUILD tf2_msgs-9999.ebuild 414 BLAKE2B 8bd31f8ab8712c9834a05050f16076cc57a15a8f4570d229591da065c3faa658cb3ba1eda92feb314bbe4c2efe498086b5f2a6ea776c6346a939bb9ed59f509a SHA512 b086610badf63d44fb9508fa2a0dc5afb3b617053991ec5dc87672088b94818b0a3272ee6e4f9acdfff269147dda2987d630f1427567159f3558985f8f3f1663
MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_msgs/tf2_msgs-0.6.1.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.6.1.ebuild
deleted file mode 100644
index 655779b19fe6..000000000000
--- a/dev-ros/tf2_msgs/tf2_msgs-0.6.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_msgs/tf2_msgs-0.6.2.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.6.2.ebuild
deleted file mode 100644
index 655779b19fe6..000000000000
--- a/dev-ros/tf2_msgs/tf2_msgs-0.6.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_msgs/tf2_msgs-0.6.3.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.6.3.ebuild
deleted file mode 100644
index 655779b19fe6..000000000000
--- a/dev-ros/tf2_msgs/tf2_msgs-0.6.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_msgs/tf2_msgs-0.6.5.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.6.5.ebuild
deleted file mode 100644
index 655779b19fe6..000000000000
--- a/dev-ros/tf2_msgs/tf2_msgs-0.6.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_msgs/tf2_msgs-0.7.2.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.7.2.ebuild
new file mode 100644
index 000000000000..779b1cb8ae1c
--- /dev/null
+++ b/dev-ros/tf2_msgs/tf2_msgs-0.7.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild b/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild
index 655779b19fe6..779b1cb8ae1c 100644
--- a/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild
+++ b/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/geometry2"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
diff --git a/dev-ros/tf2_py/Manifest b/dev-ros/tf2_py/Manifest
index db883faedd43..ff5f0177cc28 100644
--- a/dev-ros/tf2_py/Manifest
+++ b/dev-ros/tf2_py/Manifest
@@ -1,10 +1,4 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_py-0.6.1.ebuild 414 BLAKE2B 93348fc5981f8d1947882242610ec34835c9fbc57e63db147d63e627311dd2a59463ad86734eb59d63ca568dcd0e47914a4b6628becf8fe03781e2bca28a6a05 SHA512 2d5d8540591e564816d98296a01eac4708e1ac3c1d5da370ca70b1f752304ed71019a3fba704db3729e8628d710b76d558f1b345f2bfd718f722def2b94a5036
-EBUILD tf2_py-0.6.2.ebuild 414 BLAKE2B 93348fc5981f8d1947882242610ec34835c9fbc57e63db147d63e627311dd2a59463ad86734eb59d63ca568dcd0e47914a4b6628becf8fe03781e2bca28a6a05 SHA512 2d5d8540591e564816d98296a01eac4708e1ac3c1d5da370ca70b1f752304ed71019a3fba704db3729e8628d710b76d558f1b345f2bfd718f722def2b94a5036
-EBUILD tf2_py-0.6.3.ebuild 414 BLAKE2B 93348fc5981f8d1947882242610ec34835c9fbc57e63db147d63e627311dd2a59463ad86734eb59d63ca568dcd0e47914a4b6628becf8fe03781e2bca28a6a05 SHA512 2d5d8540591e564816d98296a01eac4708e1ac3c1d5da370ca70b1f752304ed71019a3fba704db3729e8628d710b76d558f1b345f2bfd718f722def2b94a5036
-EBUILD tf2_py-0.6.5.ebuild 411 BLAKE2B 0fec656ef174533924fd84116ff55604ca2645121efb6e9dfe91eb3ad4e86564777b3f83de4f8e9fc7c5bed019067c83d140d982770b81aab9f02170fee14e44 SHA512 2f03c4b60f4942d02bd480e60f44b187f439141507a5da2273d27e52beac6e40e832173630a5d980cc089a792444bf23640de90c31ef2aeafa7fb4b1be8f56d4
-EBUILD tf2_py-9999.ebuild 414 BLAKE2B ddfb7630d561add62cb401b565df834d0d9d824f64dc099aa4963aa92381c332b05f2766b8546d7f649175bcd3ae63ef40e4754b10493055cd722dc7cb97e678 SHA512 3ee385b68f0a48c25e018f179447ea8b8c747c7e6a144280d2ed373f542754325c3ae8de791df6c91cf9e2a1ace19a5a74397fe2fb65d1bb67b3ae00f6c97c5c
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_py-0.7.2.ebuild 383 BLAKE2B e717b75cb61ea1f6149c36b29636557110fc917f999ac4b6a1b556de20e22d37e25204a4cca474b5d3b50ef0f687f9e684d47d4662e800ee55e532b183265150 SHA512 0695282d63882a513deb2cdd302b8844cf529710bd8a6d5c13c1ea2472ad5bd1e83da2eff51ebedb1e23ba8ecf7c59478b4520883c741eebb92338ac9cd094ba
+EBUILD tf2_py-9999.ebuild 383 BLAKE2B e717b75cb61ea1f6149c36b29636557110fc917f999ac4b6a1b556de20e22d37e25204a4cca474b5d3b50ef0f687f9e684d47d4662e800ee55e532b183265150 SHA512 0695282d63882a513deb2cdd302b8844cf529710bd8a6d5c13c1ea2472ad5bd1e83da2eff51ebedb1e23ba8ecf7c59478b4520883c741eebb92338ac9cd094ba
MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_py/tf2_py-0.6.1.ebuild b/dev-ros/tf2_py/tf2_py-0.6.1.ebuild
deleted file mode 100644
index 97b18592a9a3..000000000000
--- a/dev-ros/tf2_py/tf2_py-0.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 python bindings"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/tf2
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/tf2_py-0.6.2.ebuild b/dev-ros/tf2_py/tf2_py-0.6.2.ebuild
deleted file mode 100644
index 97b18592a9a3..000000000000
--- a/dev-ros/tf2_py/tf2_py-0.6.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 python bindings"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/tf2
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/tf2_py-0.6.3.ebuild b/dev-ros/tf2_py/tf2_py-0.6.3.ebuild
deleted file mode 100644
index 97b18592a9a3..000000000000
--- a/dev-ros/tf2_py/tf2_py-0.6.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 python bindings"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/tf2
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/tf2_py-0.6.5.ebuild b/dev-ros/tf2_py/tf2_py-0.6.5.ebuild
deleted file mode 100644
index 914301bd058c..000000000000
--- a/dev-ros/tf2_py/tf2_py-0.6.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 python bindings"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/tf2
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/tf2_py-0.7.2.ebuild b/dev-ros/tf2_py/tf2_py-0.7.2.ebuild
new file mode 100644
index 000000000000..2df081c1a54e
--- /dev/null
+++ b/dev-ros/tf2_py/tf2_py-0.7.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 python bindings"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf2
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/tf2_py-9999.ebuild b/dev-ros/tf2_py/tf2_py-9999.ebuild
index 8228f47ca0ba..2df081c1a54e 100644
--- a/dev-ros/tf2_py/tf2_py-9999.ebuild
+++ b/dev-ros/tf2_py/tf2_py-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/geometry2"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/tf2_ros/Manifest b/dev-ros/tf2_ros/Manifest
index dfac9a5c4e25..17c77b94a192 100644
--- a/dev-ros/tf2_ros/Manifest
+++ b/dev-ros/tf2_ros/Manifest
@@ -1,10 +1,4 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_ros-0.6.1.ebuild 863 BLAKE2B de1be6947d42661a1e4826884c1c4f9ebddbe0c506fc91e1cb40c2ff05d3c4a19265b6af56dc95258404cf3ad5a25607eaa5fe2515836870dc85bed771735986 SHA512 1f01d037cc92884ed61b4b15a9911e2d9a68152267612ebf7fc3785b89d2e6b738fa7f439c40bc59a071d859b638ed7e7e5b1e8e22b47d804fcbe1b7c76cc3bf
-EBUILD tf2_ros-0.6.2.ebuild 863 BLAKE2B de1be6947d42661a1e4826884c1c4f9ebddbe0c506fc91e1cb40c2ff05d3c4a19265b6af56dc95258404cf3ad5a25607eaa5fe2515836870dc85bed771735986 SHA512 1f01d037cc92884ed61b4b15a9911e2d9a68152267612ebf7fc3785b89d2e6b738fa7f439c40bc59a071d859b638ed7e7e5b1e8e22b47d804fcbe1b7c76cc3bf
-EBUILD tf2_ros-0.6.3.ebuild 863 BLAKE2B de1be6947d42661a1e4826884c1c4f9ebddbe0c506fc91e1cb40c2ff05d3c4a19265b6af56dc95258404cf3ad5a25607eaa5fe2515836870dc85bed771735986 SHA512 1f01d037cc92884ed61b4b15a9911e2d9a68152267612ebf7fc3785b89d2e6b738fa7f439c40bc59a071d859b638ed7e7e5b1e8e22b47d804fcbe1b7c76cc3bf
-EBUILD tf2_ros-0.6.5.ebuild 860 BLAKE2B 504c785a1b122cdcfe985ab727c3f4a7c523452cdff5b94cc3d66ff67e0feb64dab06ce8103495518be2d8dd6d041d8419443810b084423a74abfe55c9fef2d8 SHA512 c75d70ac5edde4aadd3405f2cd26a90643a3155c57b958f1686d1f5b2aee5bdbb674b68a526e425e30e7f88129448917f92b590a906ddbdf69020922ac87df04
-EBUILD tf2_ros-9999.ebuild 863 BLAKE2B f456a8e3f159c2271d35970cc06c08880fc45d321b4bd35a1926102d008af02762fc1024ab0aa453150975634ea74d3bca4714ffdf5f09c2663be11ea6b0ddd2 SHA512 900d622cad352217d1a3211ed32a2002db47c032dfa8552a2c524e06de9c31ae8bd59c899285ad4e18ef656bb6afee11c1f583006a5ffa220f1657d3905906a4
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_ros-0.7.2.ebuild 876 BLAKE2B 865752d2f329eab4370cc09a5f282dfb119c48cdad536d4d0341764a6646d654af53bceee1f5d7545390c161bfac9e28e042aaa43668271e9cf00b37e73552a6 SHA512 4f937a886d23290c584c70ecfc2d7454dd2ff6a7d1c321bc75574ed29fd55c978c64eb94ef4b5ee869acdb19de3ae68d5b0fe1992162cc08f7b3731a5b049914
+EBUILD tf2_ros-9999.ebuild 876 BLAKE2B 865752d2f329eab4370cc09a5f282dfb119c48cdad536d4d0341764a6646d654af53bceee1f5d7545390c161bfac9e28e042aaa43668271e9cf00b37e73552a6 SHA512 4f937a886d23290c584c70ecfc2d7454dd2ff6a7d1c321bc75574ed29fd55c978c64eb94ef4b5ee869acdb19de3ae68d5b0fe1992162cc08f7b3731a5b049914
MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_ros/tf2_ros-0.6.1.ebuild b/dev-ros/tf2_ros/tf2_ros-0.6.1.ebuild
deleted file mode 100644
index 0e85b91f5107..000000000000
--- a/dev-ros/tf2_ros/tf2_ros-0.6.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="ROS bindings for the tf2 library, for both Python and C++"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/actionlib[${PYTHON_USEDEP}]
- dev-ros/message_filters
- dev-ros/roscpp
- dev-ros/rosgraph
- dev-libs/boost:=[threads]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf2
- dev-ros/tf2_py[${PYTHON_USEDEP}]
- dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf2_ros/tf2_ros-0.6.2.ebuild b/dev-ros/tf2_ros/tf2_ros-0.6.2.ebuild
deleted file mode 100644
index 0e85b91f5107..000000000000
--- a/dev-ros/tf2_ros/tf2_ros-0.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="ROS bindings for the tf2 library, for both Python and C++"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/actionlib[${PYTHON_USEDEP}]
- dev-ros/message_filters
- dev-ros/roscpp
- dev-ros/rosgraph
- dev-libs/boost:=[threads]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf2
- dev-ros/tf2_py[${PYTHON_USEDEP}]
- dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf2_ros/tf2_ros-0.6.3.ebuild b/dev-ros/tf2_ros/tf2_ros-0.6.3.ebuild
deleted file mode 100644
index 0e85b91f5107..000000000000
--- a/dev-ros/tf2_ros/tf2_ros-0.6.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="ROS bindings for the tf2 library, for both Python and C++"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/actionlib[${PYTHON_USEDEP}]
- dev-ros/message_filters
- dev-ros/roscpp
- dev-ros/rosgraph
- dev-libs/boost:=[threads]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf2
- dev-ros/tf2_py[${PYTHON_USEDEP}]
- dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf2_ros/tf2_ros-0.6.5.ebuild b/dev-ros/tf2_ros/tf2_ros-0.6.5.ebuild
deleted file mode 100644
index fe678113d01c..000000000000
--- a/dev-ros/tf2_ros/tf2_ros-0.6.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="ROS bindings for the tf2 library, for both Python and C++"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/actionlib[${PYTHON_USEDEP}]
- dev-ros/message_filters
- dev-ros/roscpp
- dev-ros/rosgraph
- dev-libs/boost:=[threads]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf2
- dev-ros/tf2_py[${PYTHON_USEDEP}]
- dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf2_ros/tf2_ros-0.7.2.ebuild b/dev-ros/tf2_ros/tf2_ros-0.7.2.ebuild
new file mode 100644
index 000000000000..0cecd8403f76
--- /dev/null
+++ b/dev-ros/tf2_ros/tf2_ros-0.7.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS bindings for the tf2 library, for both Python and C++"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/message_filters
+ dev-ros/roscpp
+ dev-ros/rosgraph
+ dev-libs/boost:=[threads]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf2
+ dev-ros/tf2_py[${PYTHON_USEDEP}]
+ dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/tf2_ros/tf2_ros-9999.ebuild b/dev-ros/tf2_ros/tf2_ros-9999.ebuild
index 00234a1ad22c..0cecd8403f76 100644
--- a/dev-ros/tf2_ros/tf2_ros-9999.ebuild
+++ b/dev-ros/tf2_ros/tf2_ros-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/geometry2"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -24,8 +23,11 @@ RDEPEND="
dev-ros/tf2
dev-ros/tf2_py[${PYTHON_USEDEP}]
dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/tf2_sensor_msgs/Manifest b/dev-ros/tf2_sensor_msgs/Manifest
index 86918131241e..861d0d13ea99 100644
--- a/dev-ros/tf2_sensor_msgs/Manifest
+++ b/dev-ros/tf2_sensor_msgs/Manifest
@@ -1,6 +1,4 @@
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_sensor_msgs-0.6.3.ebuild 669 BLAKE2B dcbbfed6d01622cb9180e5710c873c91b3c89f98b687ef997d6bde5b7a674d5ff28167690e058fb811f4c14abe98f0dae052e333bef7ad512f26da08b060f518 SHA512 5fd908cf73de8cac73082449f277cc8855eef78b3592ffd4f3ac103f2f441a71d4e625239781de015e7318ae44d9b47c4a72d28e2e70e21f18cec3ec17a31382
-EBUILD tf2_sensor_msgs-0.6.5.ebuild 666 BLAKE2B 8342c5fe47e91e18e7c69f7355db1292dcb479562eb02652a65a2a43cdc6eb01cc9cacfea7a74e983c9332ac0c4fe83467722e470579e2c45893951bfb28f9e0 SHA512 b4d0df4072c72bb654bd661aca9d9854e4921ac17eb6c18cba3e52b91597ea94c58e53cad6d7251b4d3924f9958cd82ea850cbc1228363873dd396244fc0ba47
-EBUILD tf2_sensor_msgs-9999.ebuild 669 BLAKE2B 421e0a9477b65e934283192c07b6e8f61fffceb9b563c6fb3da5b4206c1f9c5fbe3d48c277acf604166d014d212b1f3e04c721c692a2723d2112438c1278f325 SHA512 457c001966d6e995f0773f3c6faa15dce13f82f60de4adb4814c1cd624fb60e76cb0cd2c8fbde72dca2ae26fe6250c7c913cd9c26fd2c724df09589929de1db1
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_sensor_msgs-0.7.2.ebuild 661 BLAKE2B 197c5e3df9243e2b9589f595b0986cfdb7e09318bc38d9a1795aa99d2dae3ae10d9755c2082822c084c42b524b8c501a6ba08a2036a03fc740bd924020a70bf2 SHA512 b021fa790a40492ea41fb2f8436db094a5e9c81e34819344de26eec78503e38134aa57e29cf6ded729737087166bbad736089b5a8c978f5f90bacb9152ab8f06
+EBUILD tf2_sensor_msgs-9999.ebuild 661 BLAKE2B 197c5e3df9243e2b9589f595b0986cfdb7e09318bc38d9a1795aa99d2dae3ae10d9755c2082822c084c42b524b8c501a6ba08a2036a03fc740bd924020a70bf2 SHA512 b021fa790a40492ea41fb2f8436db094a5e9c81e34819344de26eec78503e38134aa57e29cf6ded729737087166bbad736089b5a8c978f5f90bacb9152ab8f06
MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.3.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.3.ebuild
deleted file mode 100644
index b4c841429ce6..000000000000
--- a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/tf2_ros[${PYTHON_USEDEP}]
- dev-ros/tf2
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
- dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.5.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.5.ebuild
deleted file mode 100644
index 48bdaf11cbeb..000000000000
--- a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/tf2_ros[${PYTHON_USEDEP}]
- dev-ros/tf2
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
- dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.2.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.2.ebuild
new file mode 100644
index 000000000000..d948377cc829
--- /dev/null
+++ b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf2_ros[${PYTHON_USEDEP}]
+ dev-ros/tf2
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
+ dev-ros/cmake_modules
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-9999.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-9999.ebuild
index 9d28f70aecb0..d948377cc829 100644
--- a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-9999.ebuild
+++ b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/geometry2"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -19,8 +18,10 @@ RDEPEND="
dev-ros/tf2
dev-ros/rospy[${PYTHON_USEDEP}]
dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
- dev-ros/cmake_modules"
+ dev-ros/cmake_modules
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/tf2_tools/Manifest b/dev-ros/tf2_tools/Manifest
index 9b084839d3b3..b75e34bfe11b 100644
--- a/dev-ros/tf2_tools/Manifest
+++ b/dev-ros/tf2_tools/Manifest
@@ -1,10 +1,4 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_tools-0.6.1.ebuild 588 BLAKE2B 5aba4f327df42e6bb555043e15367d575be51997d5d745470eae16a0d834912df48b80f66d5bfebd7dc457c10244c525df92c0f30beb5f3ed08dd5953849542d SHA512 825f55b62e45e765e9f362958f048a78bf874bc9b941fbe40d292619eb4ac13fc6c5bef361a3f4bcd196be173e3ea0f9b4c3d05f7f531246a810f6b8da8337f7
-EBUILD tf2_tools-0.6.2.ebuild 588 BLAKE2B 5aba4f327df42e6bb555043e15367d575be51997d5d745470eae16a0d834912df48b80f66d5bfebd7dc457c10244c525df92c0f30beb5f3ed08dd5953849542d SHA512 825f55b62e45e765e9f362958f048a78bf874bc9b941fbe40d292619eb4ac13fc6c5bef361a3f4bcd196be173e3ea0f9b4c3d05f7f531246a810f6b8da8337f7
-EBUILD tf2_tools-0.6.3.ebuild 588 BLAKE2B 5aba4f327df42e6bb555043e15367d575be51997d5d745470eae16a0d834912df48b80f66d5bfebd7dc457c10244c525df92c0f30beb5f3ed08dd5953849542d SHA512 825f55b62e45e765e9f362958f048a78bf874bc9b941fbe40d292619eb4ac13fc6c5bef361a3f4bcd196be173e3ea0f9b4c3d05f7f531246a810f6b8da8337f7
-EBUILD tf2_tools-0.6.5.ebuild 588 BLAKE2B 5aba4f327df42e6bb555043e15367d575be51997d5d745470eae16a0d834912df48b80f66d5bfebd7dc457c10244c525df92c0f30beb5f3ed08dd5953849542d SHA512 825f55b62e45e765e9f362958f048a78bf874bc9b941fbe40d292619eb4ac13fc6c5bef361a3f4bcd196be173e3ea0f9b4c3d05f7f531246a810f6b8da8337f7
-EBUILD tf2_tools-9999.ebuild 588 BLAKE2B 5aba4f327df42e6bb555043e15367d575be51997d5d745470eae16a0d834912df48b80f66d5bfebd7dc457c10244c525df92c0f30beb5f3ed08dd5953849542d SHA512 825f55b62e45e765e9f362958f048a78bf874bc9b941fbe40d292619eb4ac13fc6c5bef361a3f4bcd196be173e3ea0f9b4c3d05f7f531246a810f6b8da8337f7
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_tools-0.7.2.ebuild 560 BLAKE2B 405bb513eb7e1fbf9a27c83d9a267aaa77db97bd1e0a6075ee34f190b8e186ae521ef851173fb662cd632b6ec6271b5501f698befd31963339fb1571f9203847 SHA512 2dd1c410a203f68784d1940b2ee05368800489a8951868afec64eb3a06f0f8a2dc83a97357f74ed8df3145a3674c954db2e7675ee80be556e9a779a9dd2db61e
+EBUILD tf2_tools-9999.ebuild 560 BLAKE2B 405bb513eb7e1fbf9a27c83d9a267aaa77db97bd1e0a6075ee34f190b8e186ae521ef851173fb662cd632b6ec6271b5501f698befd31963339fb1571f9203847 SHA512 2dd1c410a203f68784d1940b2ee05368800489a8951868afec64eb3a06f0f8a2dc83a97357f74ed8df3145a3674c954db2e7675ee80be556e9a779a9dd2db61e
MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_tools/tf2_tools-0.6.1.ebuild b/dev-ros/tf2_tools/tf2_tools-0.6.1.ebuild
deleted file mode 100644
index 26643ae431b7..000000000000
--- a/dev-ros/tf2_tools/tf2_tools-0.6.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for 2nd gen Transform library"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf2_py[${PYTHON_USEDEP}]
- dev-ros/tf2_ros[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_tools/tf2_tools-0.6.2.ebuild b/dev-ros/tf2_tools/tf2_tools-0.6.2.ebuild
deleted file mode 100644
index 26643ae431b7..000000000000
--- a/dev-ros/tf2_tools/tf2_tools-0.6.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for 2nd gen Transform library"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf2_py[${PYTHON_USEDEP}]
- dev-ros/tf2_ros[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_tools/tf2_tools-0.6.3.ebuild b/dev-ros/tf2_tools/tf2_tools-0.6.3.ebuild
deleted file mode 100644
index 26643ae431b7..000000000000
--- a/dev-ros/tf2_tools/tf2_tools-0.6.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for 2nd gen Transform library"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf2_py[${PYTHON_USEDEP}]
- dev-ros/tf2_ros[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_tools/tf2_tools-0.6.5.ebuild b/dev-ros/tf2_tools/tf2_tools-0.6.5.ebuild
deleted file mode 100644
index 26643ae431b7..000000000000
--- a/dev-ros/tf2_tools/tf2_tools-0.6.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for 2nd gen Transform library"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf2_py[${PYTHON_USEDEP}]
- dev-ros/tf2_ros[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_tools/tf2_tools-0.7.2.ebuild b/dev-ros/tf2_tools/tf2_tools-0.7.2.ebuild
new file mode 100644
index 000000000000..8f11524598a4
--- /dev/null
+++ b/dev-ros/tf2_tools/tf2_tools-0.7.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for 2nd gen Transform library"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf2_py[${PYTHON_USEDEP}]
+ dev-ros/tf2_ros[${PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_tools/tf2_tools-9999.ebuild b/dev-ros/tf2_tools/tf2_tools-9999.ebuild
index 26643ae431b7..8f11524598a4 100644
--- a/dev-ros/tf2_tools/tf2_tools-9999.ebuild
+++ b/dev-ros/tf2_tools/tf2_tools-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/geometry2"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/tf_conversions/Manifest b/dev-ros/tf_conversions/Manifest
index 0b1d079c7b70..8c0cf5ea18e6 100644
--- a/dev-ros/tf_conversions/Manifest
+++ b/dev-ros/tf_conversions/Manifest
@@ -1,6 +1,4 @@
-DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
-DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
-EBUILD tf_conversions-1.11.9-r1.ebuild 728 BLAKE2B 9380598c515d30683ef9a1904897f701b9e6729322e4a3ac06cbcebcfec6676d0f49cb0f25264c1f27c805b460781b14f5061fee7148f1704b331e6752ffe097 SHA512 14983a751eaf870844fba7f2fdaec1df22a6f5bf6ac28ea700a146df5ec3524efcb3274bc0398ad3b5b24d862dc0788a1c0a5da7ec1c8139db0e6ec1134dd5db
-EBUILD tf_conversions-1.12.0.ebuild 728 BLAKE2B 9380598c515d30683ef9a1904897f701b9e6729322e4a3ac06cbcebcfec6676d0f49cb0f25264c1f27c805b460781b14f5061fee7148f1704b331e6752ffe097 SHA512 14983a751eaf870844fba7f2fdaec1df22a6f5bf6ac28ea700a146df5ec3524efcb3274bc0398ad3b5b24d862dc0788a1c0a5da7ec1c8139db0e6ec1134dd5db
-EBUILD tf_conversions-9999.ebuild 728 BLAKE2B 9380598c515d30683ef9a1904897f701b9e6729322e4a3ac06cbcebcfec6676d0f49cb0f25264c1f27c805b460781b14f5061fee7148f1704b331e6752ffe097 SHA512 14983a751eaf870844fba7f2fdaec1df22a6f5bf6ac28ea700a146df5ec3524efcb3274bc0398ad3b5b24d862dc0788a1c0a5da7ec1c8139db0e6ec1134dd5db
+DIST geometry-1.13.2.tar.gz 188225 BLAKE2B b08e78b298c94c38baa5d25a878be703d7d3a310277b66690b9fe4da1d0cd3f9083cf3bf6dc1d59149599b6fb0ec10feaf668206da245ed7e0cb9cf1878b620c SHA512 504de0e7ebf1dd73e918ab4fa39967cc9e39a53d487072430106b391d669ddfc7e530b66b38f4f73d1787e4a73acdad8e707c6757afe2e235157d4aa19f28af2
+EBUILD tf_conversions-1.13.2.ebuild 696 BLAKE2B 22fb7c26b070e61b9db4b06eac3220f18028504a2ba98761969117001588a91615c9cc64bdf2cb8b0ab1e5812b160b3f1b26498a71706db58ad85b4895eb7d9b SHA512 2f65cce576bd9a0b9a20cb345f2c0a8d58f9900a8af247c7cee9a1c7a04ab29a41fe92e487176e7cda41ab31953160bc1d0b76755096f844876c3dd75f279d63
+EBUILD tf_conversions-9999.ebuild 696 BLAKE2B 22fb7c26b070e61b9db4b06eac3220f18028504a2ba98761969117001588a91615c9cc64bdf2cb8b0ab1e5812b160b3f1b26498a71706db58ad85b4895eb7d9b SHA512 2f65cce576bd9a0b9a20cb345f2c0a8d58f9900a8af247c7cee9a1c7a04ab29a41fe92e487176e7cda41ab31953160bc1d0b76755096f844876c3dd75f279d63
MISC metadata.xml 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/tf_conversions/tf_conversions-1.11.9-r1.ebuild b/dev-ros/tf_conversions/tf_conversions-1.11.9-r1.ebuild
deleted file mode 100644
index 9e9aa0f339c9..000000000000
--- a/dev-ros/tf_conversions/tf_conversions-1.11.9-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Conversion functions to convert common tf datatypes into identical datatypes used by other libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/kdl_conversions
- dev-ros/tf[${PYTHON_USEDEP}]
- sci-libs/orocos_kdl:=
- dev-cpp/eigen:3
- dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf_conversions/tf_conversions-1.12.0.ebuild b/dev-ros/tf_conversions/tf_conversions-1.12.0.ebuild
deleted file mode 100644
index 9e9aa0f339c9..000000000000
--- a/dev-ros/tf_conversions/tf_conversions-1.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Conversion functions to convert common tf datatypes into identical datatypes used by other libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/kdl_conversions
- dev-ros/tf[${PYTHON_USEDEP}]
- sci-libs/orocos_kdl:=
- dev-cpp/eigen:3
- dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf_conversions/tf_conversions-1.13.2.ebuild b/dev-ros/tf_conversions/tf_conversions-1.13.2.ebuild
new file mode 100644
index 000000000000..a23bc799bb84
--- /dev/null
+++ b/dev-ros/tf_conversions/tf_conversions-1.13.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Functions to convert common tf datatypes into those used by other libraries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/kdl_conversions
+ dev-ros/tf[${PYTHON_USEDEP}]
+ sci-libs/orocos_kdl:=
+ dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-cpp/eigen:3
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ test? ( dev-cpp/gtest dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf_conversions/tf_conversions-9999.ebuild b/dev-ros/tf_conversions/tf_conversions-9999.ebuild
index 9e9aa0f339c9..a23bc799bb84 100644
--- a/dev-ros/tf_conversions/tf_conversions-9999.ebuild
+++ b/dev-ros/tf_conversions/tf_conversions-9999.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/geometry"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="Conversion functions to convert common tf datatypes into identical datatypes used by other libraries"
+DESCRIPTION="Functions to convert common tf datatypes into those used by other libraries"
LICENSE="BSD"
SLOT="0"
IUSE=""
RDEPEND="
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
dev-ros/kdl_conversions
dev-ros/tf[${PYTHON_USEDEP}]
sci-libs/orocos_kdl:=
- dev-cpp/eigen:3
dev-ros/rospy[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
+ dev-cpp/eigen:3
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? ( dev-cpp/gtest dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/theora_image_transport/Manifest b/dev-ros/theora_image_transport/Manifest
index e70a6702c988..ec67f512df52 100644
--- a/dev-ros/theora_image_transport/Manifest
+++ b/dev-ros/theora_image_transport/Manifest
@@ -1,4 +1,4 @@
-DIST image_transport_plugins-1.9.5.tar.gz 26268 BLAKE2B 2d7e71f891bc3ae548193a9671fb10fb4dc6c7a24fda0c0dc52d75d43793d55e35da37155496740624e4ebe34fcf0e8d3926345ca1581fa521096c01b773f551 SHA512 54f459719a386f028578889f9b88b8b080f495d75899cee6c8bfb58204970fb2395b2a8da70034eb391ba62f4ce462cb89b97bcdc576a177444613076b5ed02c
-EBUILD theora_image_transport-1.9.5-r1.ebuild 789 BLAKE2B b282ad8b57e9ed7dded23494a3810fd77a2c90ab710dadfad714d82c2c51d06526429ceb40ab2d521232b6d9599d12a844276be70ddcbe20860db7e43fed23b8 SHA512 13bc08389db9e05dfe415bf3a7e29346ed62cdd19e33cba9041eb2ada68406c243877df12279b487ba65f9f94de9dcb0e4dcc1874313b971f89cb8919c25d0c5
-EBUILD theora_image_transport-9999.ebuild 789 BLAKE2B b282ad8b57e9ed7dded23494a3810fd77a2c90ab710dadfad714d82c2c51d06526429ceb40ab2d521232b6d9599d12a844276be70ddcbe20860db7e43fed23b8 SHA512 13bc08389db9e05dfe415bf3a7e29346ed62cdd19e33cba9041eb2ada68406c243877df12279b487ba65f9f94de9dcb0e4dcc1874313b971f89cb8919c25d0c5
+DIST image_transport_plugins-1.14.0.tar.gz 28803 BLAKE2B fc3fc34c0dc01c5dc0ed7f2a88fd691f9b955009bbf91a2280e39455e0325a46edc67c25cf79d8e4882789c20235c13fb87bfc64669ffda40a1fe37224a346e9 SHA512 1333f18a3208ecda4f788dc2d974b5787a89d33a1ad1ea2c6b4cc07593c677686aa5e9df3346d2e5f307699b88b42f341a989eebecc3cd7885768e3dcdbbcdcb
+EBUILD theora_image_transport-1.14.0.ebuild 750 BLAKE2B ff776dbe00269593180d20263c294df48124987571964bb67713c79b053d603f59d45446fd5bd0c3d0ff223ebdd9dbc503f12c6b6ee12ef885cdd2261329ec9e SHA512 d9cd8a1d42bdc3ace4be1c84955f5f6b12e5f72fefb552cdb334e5fe9d5279c9a576c651576c5988dc45ae1dbf5b0031f3f1d06ed5d5e3a37c58c54aacc56b0c
+EBUILD theora_image_transport-9999.ebuild 750 BLAKE2B ff776dbe00269593180d20263c294df48124987571964bb67713c79b053d603f59d45446fd5bd0c3d0ff223ebdd9dbc503f12c6b6ee12ef885cdd2261329ec9e SHA512 d9cd8a1d42bdc3ace4be1c84955f5f6b12e5f72fefb552cdb334e5fe9d5279c9a576c651576c5988dc45ae1dbf5b0031f3f1d06ed5d5e3a37c58c54aacc56b0c
MISC metadata.xml 352 BLAKE2B d741d3235de6a630917b5785819ea9a3b13d8602bc5fd27b9fb8d4cea1df216fb64eaa0fd2fee5c5f11012a823311155331e2ae65af23874322679dc57bc32a9 SHA512 855c756eea98c52acb020fb394646008db35b41b864a0983f67bbf07ffce658d394c0de13d6622286770e4aa4152b74f2f6028c575b11b66233431d1fffa0347
diff --git a/dev-ros/theora_image_transport/theora_image_transport-1.14.0.ebuild b/dev-ros/theora_image_transport/theora_image_transport-1.14.0.ebuild
new file mode 100644
index 000000000000..1b9ba86f85e6
--- /dev/null
+++ b/dev-ros/theora_image_transport/theora_image_transport-1.14.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Plugin for transparently sending an image stream encoded with the Theora codec"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge
+ media-libs/opencv:=
+ dev-ros/dynamic_reconfigure
+ dev-ros/image_transport
+ media-libs/opencv
+ dev-ros/rosbag
+ dev-ros/pluginlib
+ media-libs/libogg
+ media-libs/libtheora[encode]
+ dev-libs/boost:=
+ dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig"
diff --git a/dev-ros/theora_image_transport/theora_image_transport-1.9.5-r1.ebuild b/dev-ros/theora_image_transport/theora_image_transport-1.9.5-r1.ebuild
deleted file mode 100644
index a13838696800..000000000000
--- a/dev-ros/theora_image_transport/theora_image_transport-1.9.5-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Plugin to image_transport for transparently sending an image stream encoded with the Theora codec"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- media-libs/opencv:=
- dev-ros/dynamic_reconfigure
- dev-ros/image_transport
- media-libs/opencv
- dev-ros/rosbag
- dev-ros/pluginlib
- media-libs/libogg
- media-libs/libtheora[encode]
- dev-libs/boost:=
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
diff --git a/dev-ros/theora_image_transport/theora_image_transport-9999.ebuild b/dev-ros/theora_image_transport/theora_image_transport-9999.ebuild
index a13838696800..1b9ba86f85e6 100644
--- a/dev-ros/theora_image_transport/theora_image_transport-9999.ebuild
+++ b/dev-ros/theora_image_transport/theora_image_transport-9999.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
inherit ros-catkin
-DESCRIPTION="Plugin to image_transport for transparently sending an image stream encoded with the Theora codec"
+DESCRIPTION="Plugin for transparently sending an image stream encoded with the Theora codec"
LICENSE="BSD"
SLOT="0"
IUSE=""
@@ -29,5 +28,6 @@ RDEPEND="
dev-libs/boost:=
dev-libs/console_bridge:=
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig"
diff --git a/dev-ros/timestamp_tools/Manifest b/dev-ros/timestamp_tools/Manifest
index 1fa0090bfbf3..af015fb5c824 100644
--- a/dev-ros/timestamp_tools/Manifest
+++ b/dev-ros/timestamp_tools/Manifest
@@ -1,5 +1,5 @@
-AUX tests.patch 652 BLAKE2B 5542e9c18f33575defc466ff28bce65742f09c37d92f1d94ff1143007e45c80bdc9dd453f15d8688bbb0028ead676e619923226cad7342bd70483bd51b4e9e18 SHA512 c2cb51521d82a93857bf67ceb0090e78c1973eaf17a0ed8376b844d1c45b736b9ecab7214636eeeef3af7ff9c2e58030d37dd707a3be0c7af8f81e26dba345f0
+AUX tests.patch 620 BLAKE2B db7be143209e2b76695d3ecd93e4a524ca692c768f881f7d5f07a6162e3fc428ff053b2342b20663d408343e491985c573d5ed54ef1aa1b9c4941a303b7a5b6b SHA512 c1fa99bd49c370fd38983971268f374f30232691fcd188ec0a2d6d1b8020d619f9e50a88bff3bd36e7463de9a1074f7ad937dc13e54142e091cd80f6c2385b56
DIST driver_common-1.6.8.tar.gz 15055 BLAKE2B 2d9a4c23d65b8e2f60343f5e3b454e1cc41334d34e0246891b533f216acb743df628d95dd2c0087b06284a85e0ea872baad495a7ed7b59c03e8f8ff32eba4ed8 SHA512 b698143d08785088ac13e62f5b96676bd590a84e4ffb147fa3698be6a8ded510f648d043ecdc1d31ba7b95fb3041d06ee1a39b224c359b8612adebdba259d188
-EBUILD timestamp_tools-1.6.8.ebuild 451 BLAKE2B 3f883ffad47f4d8ac27276c9c7de5d6cc33d5409f6d3dfd16ec10555c11ee9ec9f47fb70ed4b0990642c4deddafe90ebf493ff589f5ff105d6fdec5961387953 SHA512 2ee923cb3696eb675f1949a553e8cff4fb6b49f33907874c682825877380a8773196d3be436df3c3d09a74905cebd6633173e636661e52ad99dcae88d4021348
-EBUILD timestamp_tools-9999.ebuild 451 BLAKE2B 3f883ffad47f4d8ac27276c9c7de5d6cc33d5409f6d3dfd16ec10555c11ee9ec9f47fb70ed4b0990642c4deddafe90ebf493ff589f5ff105d6fdec5961387953 SHA512 2ee923cb3696eb675f1949a553e8cff4fb6b49f33907874c682825877380a8773196d3be436df3c3d09a74905cebd6633173e636661e52ad99dcae88d4021348
+EBUILD timestamp_tools-1.6.8.ebuild 448 BLAKE2B 6bbd6247a6b33663f7777e425dc3824417ba1aa25beae2c7bab20ccbfe19d8c6f041c4e5e85c7d919b813e8ddcfc9d736da754d10d88588f5ed5dcd3dcfc8822 SHA512 01d13e6778c31f6ba9bd026606f468c36c65cc8cf22772d8700933a35e231988419864dc0abbf3d9e1253e46306f6d767be15279a4f0bd63b0542dee77c19dcb
+EBUILD timestamp_tools-9999.ebuild 410 BLAKE2B 627e05be16f91b39c5245d05bab24312fac9ea4efc441969c4f515ed8508cb5e9cc181905e316178825dd27cbabb3d444cee24ee1502ed1fd3b6ec4e5e867413 SHA512 5aedc52d6ea8a6281e4afc643be3e3edfe6cb861eeaf82b3f76403854e7f2e840e8854fbdad52c2fd0e0935de2e07b364fa701f1fcec0660fb29c67ced598241
MISC metadata.xml 339 BLAKE2B 71ed9f79df6d8528f3d967c077f1d01e0290573400356e3749bd24254281651f09507894d2ca4029b8b8a77b51d31d080d9560d9995d3d9fde848f0d71ec083d SHA512 e24ff4ef526475ad5bff434350abb00afccb4c101ab624ee056c1502719d15ec4889eff9170c534af62ba8719bd5fe4f3cf206353244f56e486a29afea53ee7b
diff --git a/dev-ros/timestamp_tools/files/tests.patch b/dev-ros/timestamp_tools/files/tests.patch
index c73d09a1b1ac..d66118537ed3 100644
--- a/dev-ros/timestamp_tools/files/tests.patch
+++ b/dev-ros/timestamp_tools/files/tests.patch
@@ -1,7 +1,7 @@
Index: driver_common-1.6.8/timestamp_tools/CMakeLists.txt
===================================================================
---- driver_common-1.6.8.orig/timestamp_tools/CMakeLists.txt
-+++ driver_common-1.6.8/timestamp_tools/CMakeLists.txt
+--- driver_common-1.6.8.orig/CMakeLists.txt
++++ driver_common-1.6.8/CMakeLists.txt
@@ -17,5 +17,7 @@ install(DIRECTORY include/${PROJECT_NAME
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
FILES_MATCHING PATTERN "*.h")
diff --git a/dev-ros/timestamp_tools/timestamp_tools-1.6.8.ebuild b/dev-ros/timestamp_tools/timestamp_tools-1.6.8.ebuild
index 1c7b8786e13d..bb92a2937937 100644
--- a/dev-ros/timestamp_tools/timestamp_tools-1.6.8.ebuild
+++ b/dev-ros/timestamp_tools/timestamp_tools-1.6.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-drivers/driver_common"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
diff --git a/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild b/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild
index 1c7b8786e13d..5c96c2266bfb 100644
--- a/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild
+++ b/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-drivers/driver_common"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
@@ -19,4 +19,3 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest
index 857fbbf35b91..1829229a397f 100644
--- a/dev-ros/topic_tools/Manifest
+++ b/dev-ros/topic_tools/Manifest
@@ -1,7 +1,4 @@
-AUX yaml.patch 2150 BLAKE2B 5620056ff8c1da96f7f5e42bf4fccff73763211051d7c39c35c3dd6181aba3059dcbe9e32b5b6edb6ba4f074601dee7937e6093c321e3b236a7de2bcd7f9252d SHA512 4b9b884c1b29987bff911a945daec6841fb19b5fa34d0b6ffd81c3c338412c3faf5787240c39e7ff5a952841131aeb3f2994161eddc5c3a9b4173c099660e9bd
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD topic_tools-1.14.3-r1.ebuild 729 BLAKE2B ccc071e3a6170f559e3e9dce6886621f4c7c1c72b11ce1f66e83cd04092cd6cc999e7e0526baf9c8a6336c976f27ebcf213d01186aae486cfcdb80a4eeef58dd SHA512 5181892055fbb64cba30d9467d30639c3f23435b805be1c9ea32fd8f19aeafa0a3b152a0106398e69b45134f5f317a3ca2b96f1e2e04e164bee52fa2dc619a40
-EBUILD topic_tools-1.15.4.ebuild 692 BLAKE2B 18d9cb31888309b6e5cbec2c1c30567f0d68bb763081c2a51ae1a3839f768d49e8f7b4de73553d4263ebf44ce4dad81044fc7cc0298f3e18b93eef151037df26 SHA512 3a2c93aa9a49182054372a4115d3cb8f5cfa8b8aed0fb0509b76260492afa218e0c4867d365f04c76a0f1133947f43d7ea75c590c038245d6a6ecd41a29af4fb
-EBUILD topic_tools-9999.ebuild 695 BLAKE2B 63c6c776011923217856c1392fb0d292d0bb44bebd000c7fa6530371a237aefda1a18c07bd78d9352d0f4dc7608a1c9dd335710cc6860485678dd2da4fa621df SHA512 918f548657eeab6f571e371dde921b0cdc374890b3f4a80b9eb51ece52e3404ce750a9447d1139e15a60409054f8f3e6d829f75ad538e6c80ffa8617eaca646a
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+EBUILD topic_tools-1.15.7.ebuild 664 BLAKE2B ab2641f65dc1f14ff20cf65053fc073e928bf828601c62a1404f07d6b7f296403e0fe2dda21750c25b0554647bac8d0fb2f80dc0054cf7765e338b999777df39 SHA512 3fc16abbaa51f04462a1ab8ded9591cb21a1963e6f25839f31c0ad0a4cc4615530995e1184b2828227691aa4a3753d13ed482d5c31002af3ff67ed1b64f0fe1c
+EBUILD topic_tools-9999.ebuild 664 BLAKE2B ab2641f65dc1f14ff20cf65053fc073e928bf828601c62a1404f07d6b7f296403e0fe2dda21750c25b0554647bac8d0fb2f80dc0054cf7765e338b999777df39 SHA512 3fc16abbaa51f04462a1ab8ded9591cb21a1963e6f25839f31c0ad0a4cc4615530995e1184b2828227691aa4a3753d13ed482d5c31002af3ff67ed1b64f0fe1c
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/topic_tools/files/yaml.patch b/dev-ros/topic_tools/files/yaml.patch
deleted file mode 100644
index e783e321b7fb..000000000000
--- a/dev-ros/topic_tools/files/yaml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py | 2 +-
- .../test/test_roslib_message.py | 2 +-
- .../client_verification/test_slave_api.py | 2 +-
- test/test_rosparam/test/check_rosparam.py | 8 ++---
- .../check_rosparam_command_line_online.py | 2 +-
- .../check_rosservice_command_line_online.py | 4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py | 2 +-
- tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
- tools/roslaunch/src/roslaunch/loader.py | 4 +--
- .../test/unit/test_roslaunch_dump_params.py | 4 +--
- tools/rosparam/src/rosparam/__init__.py | 7 ++++-
- tools/rosservice/src/rosservice/__init__.py | 4 +--
- tools/rostopic/src/rostopic/__init__.py | 6 ++--
- tools/topic_tools/scripts/relay_field | 2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/tools/topic_tools/scripts/relay_field b/tools/topic_tools/scripts/relay_field
-index 6630b685d..cc73ac443 100755
---- a/tools/topic_tools/scripts/relay_field
-+++ b/tools/topic_tools/scripts/relay_field
-@@ -98,7 +98,7 @@ class RelayField(object):
- if self.input_fn is not None:
- m = self.input_fn(m)
-
-- msg_generation = yaml.load(self.expression)
-+ msg_generation = yaml.safe_load(self.expression)
- pub_args = _eval_in_dict_impl(msg_generation, None, {'m': m})
-
- now = rospy.get_rostime()
diff --git a/dev-ros/topic_tools/topic_tools-1.14.3-r1.ebuild b/dev-ros/topic_tools/topic_tools-1.14.3-r1.ebuild
deleted file mode 100644
index ecddea9d6441..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cpp_common
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/rostime
- dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-cpp/gtest
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/topic_tools/topic_tools-1.15.4.ebuild b/dev-ros/topic_tools/topic_tools-1.15.4.ebuild
deleted file mode 100644
index 49f8f6d9bbb1..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.15.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cpp_common
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/rostime
- dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-cpp/gtest
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/topic_tools/topic_tools-1.15.7.ebuild b/dev-ros/topic_tools/topic_tools-1.15.7.ebuild
new file mode 100644
index 000000000000..b26890d60d63
--- /dev/null
+++ b/dev-ros/topic_tools/topic_tools-1.15.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=tools/${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cpp_common
+ dev-ros/rosconsole
+ dev-ros/roscpp
+ dev-ros/rostime
+ dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-ros/rosunit[${PYTHON_USEDEP}]
+ dev-cpp/gtest
+ dev-python/nose[${PYTHON_USEDEP}]
+ )"
diff --git a/dev-ros/topic_tools/topic_tools-9999.ebuild b/dev-ros/topic_tools/topic_tools-9999.ebuild
index a14a336c7fdc..b26890d60d63 100644
--- a/dev-ros/topic_tools/topic_tools-9999.ebuild
+++ b/dev-ros/topic_tools/topic_tools-9999.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/ros_comm"
KEYWORDS="~amd64 ~arm"
CATKIN_HAS_MESSAGES=yes
ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
inherit ros-catkin
diff --git a/dev-ros/trajectory_msgs/Manifest b/dev-ros/trajectory_msgs/Manifest
index b979491a8ec9..59d298a0fd0f 100644
--- a/dev-ros/trajectory_msgs/Manifest
+++ b/dev-ros/trajectory_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-EBUILD trajectory_msgs-1.12.5.ebuild 478 BLAKE2B 168d7e900cf043b96c6364078e0c6344b87919b695ec75596bfa17db4383716d208cd38c518d52ef19569b653b053f4d6ab067099e4ff44cb14e2dbbef283437 SHA512 b6f22dbc77e2b27b634b0005633aad10ca8ffb09ad25e20270f5662d5e0aa64169a8d185b26823a69e1a6dad6a7a114893a822b8d99a32744e35c14bd3f438bf
-EBUILD trajectory_msgs-1.12.6.ebuild 478 BLAKE2B 168d7e900cf043b96c6364078e0c6344b87919b695ec75596bfa17db4383716d208cd38c518d52ef19569b653b053f4d6ab067099e4ff44cb14e2dbbef283437 SHA512 b6f22dbc77e2b27b634b0005633aad10ca8ffb09ad25e20270f5662d5e0aa64169a8d185b26823a69e1a6dad6a7a114893a822b8d99a32744e35c14bd3f438bf
-EBUILD trajectory_msgs-1.12.7.ebuild 478 BLAKE2B 168d7e900cf043b96c6364078e0c6344b87919b695ec75596bfa17db4383716d208cd38c518d52ef19569b653b053f4d6ab067099e4ff44cb14e2dbbef283437 SHA512 b6f22dbc77e2b27b634b0005633aad10ca8ffb09ad25e20270f5662d5e0aa64169a8d185b26823a69e1a6dad6a7a114893a822b8d99a32744e35c14bd3f438bf
-EBUILD trajectory_msgs-9999.ebuild 478 BLAKE2B 168d7e900cf043b96c6364078e0c6344b87919b695ec75596bfa17db4383716d208cd38c518d52ef19569b653b053f4d6ab067099e4ff44cb14e2dbbef283437 SHA512 b6f22dbc77e2b27b634b0005633aad10ca8ffb09ad25e20270f5662d5e0aa64169a8d185b26823a69e1a6dad6a7a114893a822b8d99a32744e35c14bd3f438bf
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
+EBUILD trajectory_msgs-1.13.0.ebuild 438 BLAKE2B 34903f79dec266fa8866558b9b48061b9438cef551dcd8d9509a7e6b1ac5f790d8920df7ff0afe8e10aa81278ce3b112eaede77de8507df046eece1c01ab0cc5 SHA512 77e99f8383ad913ed10dbb42a339828eda78fb433882e816cefabb1b03dc4011e89ff8b8dfa756209e44aa4b0764b6697be9621a7c5951cfed1b33a88c1b7970
+EBUILD trajectory_msgs-9999.ebuild 438 BLAKE2B 34903f79dec266fa8866558b9b48061b9438cef551dcd8d9509a7e6b1ac5f790d8920df7ff0afe8e10aa81278ce3b112eaede77de8507df046eece1c01ab0cc5 SHA512 77e99f8383ad913ed10dbb42a339828eda78fb433882e816cefabb1b03dc4011e89ff8b8dfa756209e44aa4b0764b6697be9621a7c5951cfed1b33a88c1b7970
MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/trajectory_msgs/trajectory_msgs-1.12.5.ebuild b/dev-ros/trajectory_msgs/trajectory_msgs-1.12.5.ebuild
deleted file mode 100644
index ad5b5c80e84c..000000000000
--- a/dev-ros/trajectory_msgs/trajectory_msgs-1.12.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for defining robot trajectories"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/trajectory_msgs/trajectory_msgs-1.12.6.ebuild b/dev-ros/trajectory_msgs/trajectory_msgs-1.12.6.ebuild
deleted file mode 100644
index ad5b5c80e84c..000000000000
--- a/dev-ros/trajectory_msgs/trajectory_msgs-1.12.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for defining robot trajectories"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/trajectory_msgs/trajectory_msgs-1.12.7.ebuild b/dev-ros/trajectory_msgs/trajectory_msgs-1.12.7.ebuild
deleted file mode 100644
index ad5b5c80e84c..000000000000
--- a/dev-ros/trajectory_msgs/trajectory_msgs-1.12.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for defining robot trajectories"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/trajectory_msgs/trajectory_msgs-1.13.0.ebuild b/dev-ros/trajectory_msgs/trajectory_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..90cbd29ccbf4
--- /dev/null
+++ b/dev-ros/trajectory_msgs/trajectory_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for defining robot trajectories"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/trajectory_msgs/trajectory_msgs-9999.ebuild b/dev-ros/trajectory_msgs/trajectory_msgs-9999.ebuild
index ad5b5c80e84c..90cbd29ccbf4 100644
--- a/dev-ros/trajectory_msgs/trajectory_msgs-9999.ebuild
+++ b/dev-ros/trajectory_msgs/trajectory_msgs-9999.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/common_msgs"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
diff --git a/dev-ros/transmission_interface/Manifest b/dev-ros/transmission_interface/Manifest
index 73b571a0e254..6664dbce41e9 100644
--- a/dev-ros/transmission_interface/Manifest
+++ b/dev-ros/transmission_interface/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD transmission_interface-0.14.2.ebuild 507 BLAKE2B 5739ed7771c8ffddc445db724a19b9551cf81caead58300cc75ec110e1a2726d1767bbb64bcf31c557a271c2088faf9a70f4c03eb24ba0d6f20c93cbd449b535 SHA512 dae1b33c525e80b6a90d35d191d2067a0cb73c3e8e094cca71205aa92f6523c6a379fe932d5f9999d735d9599ff92d63e2975167d26df3cc172adb9d4d044324
-EBUILD transmission_interface-0.15.0.ebuild 507 BLAKE2B 5739ed7771c8ffddc445db724a19b9551cf81caead58300cc75ec110e1a2726d1767bbb64bcf31c557a271c2088faf9a70f4c03eb24ba0d6f20c93cbd449b535 SHA512 dae1b33c525e80b6a90d35d191d2067a0cb73c3e8e094cca71205aa92f6523c6a379fe932d5f9999d735d9599ff92d63e2975167d26df3cc172adb9d4d044324
-EBUILD transmission_interface-0.15.1.ebuild 504 BLAKE2B fad9bc2b9c61f2ef826f82f3729f61c72becb665490d9f16325c30b883d5d9fd19af44c007ee15c9b0aa6c46319702adf8d83fa64f03670d4e64198c2b2bc2fc SHA512 0e7e1262be759212925fc383cd41d228708159b82a39ae09e9e38f25458a6791fbb58f60dc393d5888601f16cb883911e184a3aea1e91b0c3e5864efd22e95ef
-EBUILD transmission_interface-9999.ebuild 507 BLAKE2B 0251e5c8440b426b21f7d8b0a552bb91003f71a9bb265ee98a1c4e2ee77801d7d70626ad19a64502ef0e7a82ef11c4248902283a24fe9f71b372aba9558bf1b3 SHA512 324c2221c0170e4737cb496c661f02ee93002dab969b5b2ede8c637ceb105d5190f1f945273cf1dc84c76f2d1be85294b3d6a05bc4f884b4453b411b8838bd2d
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD transmission_interface-0.19.1.ebuild 504 BLAKE2B 19e6524c91835592452b6e224250649229a76fc847e55c4c2a5fbce43f7d4699f1fb39f0695a3038b58074ba8e14716617d7f6b001206beb7e8f7f00c715096d SHA512 4580d47521b677436ee119c0d098334dc90fe7b68572f1813aaa885a36f9c14fc9676c53e2e3c7e8ff61d84e44b1e79e93ebd93c8922435b9cc78ab8af1e84c6
+EBUILD transmission_interface-9999.ebuild 504 BLAKE2B 19e6524c91835592452b6e224250649229a76fc847e55c4c2a5fbce43f7d4699f1fb39f0695a3038b58074ba8e14716617d7f6b001206beb7e8f7f00c715096d SHA512 4580d47521b677436ee119c0d098334dc90fe7b68572f1813aaa885a36f9c14fc9676c53e2e3c7e8ff61d84e44b1e79e93ebd93c8922435b9cc78ab8af1e84c6
MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/transmission_interface/transmission_interface-0.14.2.ebuild b/dev-ros/transmission_interface/transmission_interface-0.14.2.ebuild
deleted file mode 100644
index cbd2d0bc98b5..000000000000
--- a/dev-ros/transmission_interface/transmission_interface-0.14.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transmission Interface"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/hardware_interface
- dev-ros/pluginlib
- dev-libs/tinyxml2:=
- dev-libs/console_bridge:=
- dev-ros/resource_retriever
- dev-ros/roscpp
- dev-libs/tinyxml
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/transmission_interface/transmission_interface-0.15.0.ebuild b/dev-ros/transmission_interface/transmission_interface-0.15.0.ebuild
deleted file mode 100644
index cbd2d0bc98b5..000000000000
--- a/dev-ros/transmission_interface/transmission_interface-0.15.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transmission Interface"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/hardware_interface
- dev-ros/pluginlib
- dev-libs/tinyxml2:=
- dev-libs/console_bridge:=
- dev-ros/resource_retriever
- dev-ros/roscpp
- dev-libs/tinyxml
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/transmission_interface/transmission_interface-0.15.1.ebuild b/dev-ros/transmission_interface/transmission_interface-0.15.1.ebuild
deleted file mode 100644
index 5860da756243..000000000000
--- a/dev-ros/transmission_interface/transmission_interface-0.15.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transmission Interface"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/hardware_interface
- dev-ros/pluginlib
- dev-libs/tinyxml2:=
- dev-libs/console_bridge:=
- dev-ros/resource_retriever
- dev-ros/roscpp
- dev-libs/tinyxml
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/transmission_interface/transmission_interface-0.19.1.ebuild b/dev-ros/transmission_interface/transmission_interface-0.19.1.ebuild
new file mode 100644
index 000000000000..22b0cd832a4e
--- /dev/null
+++ b/dev-ros/transmission_interface/transmission_interface-0.19.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Transmission Interface"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/hardware_interface
+ dev-ros/pluginlib
+ dev-libs/tinyxml2:=
+ dev-libs/console_bridge:=
+ dev-ros/resource_retriever
+ dev-ros/roscpp
+ dev-libs/tinyxml
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/transmission_interface/transmission_interface-9999.ebuild b/dev-ros/transmission_interface/transmission_interface-9999.ebuild
index f606c4b418f5..22b0cd832a4e 100644
--- a/dev-ros/transmission_interface/transmission_interface-9999.ebuild
+++ b/dev-ros/transmission_interface/transmission_interface-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-controls/ros_control"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
diff --git a/dev-ros/turtle_actionlib/Manifest b/dev-ros/turtle_actionlib/Manifest
index 23d37a11fda7..684b158c4603 100644
--- a/dev-ros/turtle_actionlib/Manifest
+++ b/dev-ros/turtle_actionlib/Manifest
@@ -1,6 +1,4 @@
-DIST common_tutorials-0.1.10.tar.gz 12511 BLAKE2B deeb06317c0f56f2496277f488592ba056b82440cb320fc9ea6bd3d2d6b8828301ce03c2f5db9ed1871b4f6a1caa8c874a510c912ab89ef1d05b01f364ee09be SHA512 92a1eb5865ec3b4acc9e04a507f050d9568e583ce6d0a29f3c6ab37f4c2feb5149f1ddd6269ce1a310251f7b4cbfe8a05c7e4c6bf4c3ca21c15d84f1c6f0422b
-DIST common_tutorials-0.1.11.tar.gz 12527 BLAKE2B 679cee86aad711677d1ed74320832c7ceb6d66adb34b835a80ad536be7bff517a78ca43e04372de23b491f8156ea3a4c268b4661d74fb1c04130e39033e1b961 SHA512 a42ab4b95eeaf9620ae0987f4e1cc530213b39455dea3ff8d944ac24ee7ed8e321ac8ed4f73b8e4d8d882248a850dface0169a5d521b02b226e6d0cb6016a33a
-EBUILD turtle_actionlib-0.1.10.ebuild 634 BLAKE2B 745ef90c77f08d117725b38f0773985a73d598a4a91f5babc665c37d1cf2c60f4322599ce04145bcb1cb8152b42be0c4dcdc42009aa35a7895037b21eab9ab6e SHA512 2a0ef4ee5450238045a2e5b35b65617b34f2e64cb9806ebf9deb875f34f168cea16a71021361a266293710c1621da2f7cf1afeebc111e9460809b63efd2d5324
-EBUILD turtle_actionlib-0.1.11.ebuild 634 BLAKE2B 86fd2f1a690b9eb1dea0cf798c3befb1609b67876e26673cc0f7cfa8415dc4c52a4d781a6879c0092b53c1f67d22b2abc79f82040cbd3756f3a9a3709efc98d0 SHA512 9415ee6698ea4f3b7d5c78f6fd606f1d1d22ce9ffa2df0d13bf015a7092847e91dbfe018c2aebcf7cc09f8c1d308b45278945ebc753f2d155aaa629fe6031de9
-EBUILD turtle_actionlib-9999.ebuild 634 BLAKE2B 745ef90c77f08d117725b38f0773985a73d598a4a91f5babc665c37d1cf2c60f4322599ce04145bcb1cb8152b42be0c4dcdc42009aa35a7895037b21eab9ab6e SHA512 2a0ef4ee5450238045a2e5b35b65617b34f2e64cb9806ebf9deb875f34f168cea16a71021361a266293710c1621da2f7cf1afeebc111e9460809b63efd2d5324
+DIST common_tutorials-0.1.12.tar.gz 12609 BLAKE2B c570236517420685a4733d84694a03486798038f4b7a0e721179d602a6870b51afb558dedd64ed2ccf518bb0e37cccefcae701053eb4c5fe32ef3e2d5dc5d69b SHA512 37244290b0c84aff47172484e2f3c1eecfe3482856030a08e55f2d1b0cad903262be453e81780f58e250c4e1f24c06f6256da5ff1342617d7d5f501f38fc7527
+EBUILD turtle_actionlib-0.1.12.ebuild 603 BLAKE2B 85f56b03bd78810c8a6b0e40144fc82b0a8b0d16f0b5e053e038d000c4d06b3af52349b5ba6bb9c08859607dabe8de9c0dca3a039843929b5334f50650f8364d SHA512 bf64136a8d14ce1477cd69775c3e223dff0d97d49cd50772f00b9aeebfa09574cd428de78244bbeda6b8f861a02a5188baa2563bb9a90722fea3a5e7f9fdbab2
+EBUILD turtle_actionlib-9999.ebuild 603 BLAKE2B 85f56b03bd78810c8a6b0e40144fc82b0a8b0d16f0b5e053e038d000c4d06b3af52349b5ba6bb9c08859607dabe8de9c0dca3a039843929b5334f50650f8364d SHA512 bf64136a8d14ce1477cd69775c3e223dff0d97d49cd50772f00b9aeebfa09574cd428de78244bbeda6b8f861a02a5188baa2563bb9a90722fea3a5e7f9fdbab2
MISC metadata.xml 334 BLAKE2B 9448c76327ed1df85e94f230f66b62356f9f3f6e0ae2853cba879c3357bf19ba534098914207e4bca6e21b3a1e33a5a911084a5f83b9d9b1bdba8282bf70b6e5 SHA512 dcec72972fcaf9c06c0fcc8ed3825875667e3391de433ace73961159cede1a33c40f7dfca78ca22e018e730024af73562786f90fcc1f2ccf39ab11106f37d038
diff --git a/dev-ros/turtle_actionlib/turtle_actionlib-0.1.10.ebuild b/dev-ros/turtle_actionlib/turtle_actionlib-0.1.10.ebuild
deleted file mode 100644
index 14da5732c951..000000000000
--- a/dev-ros/turtle_actionlib/turtle_actionlib-0.1.10.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Demonstrates how to write an action server and client with the turtlesim"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/actionlib
- dev-ros/actionlib_msgs
- dev-ros/angles
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/turtlesim
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_actionlib/turtle_actionlib-0.1.11.ebuild b/dev-ros/turtle_actionlib/turtle_actionlib-0.1.11.ebuild
deleted file mode 100644
index 24600b2d603f..000000000000
--- a/dev-ros/turtle_actionlib/turtle_actionlib-0.1.11.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Demonstrates how to write an action server and client with the turtlesim"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/actionlib
- dev-ros/actionlib_msgs
- dev-ros/angles
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/turtlesim
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_actionlib/turtle_actionlib-0.1.12.ebuild b/dev-ros/turtle_actionlib/turtle_actionlib-0.1.12.ebuild
new file mode 100644
index 000000000000..f546db76e3fd
--- /dev/null
+++ b/dev-ros/turtle_actionlib/turtle_actionlib-0.1.12.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/common_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Demonstrates how to write an action server and client with the turtlesim"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/actionlib
+ dev-ros/actionlib_msgs
+ dev-ros/angles
+ dev-ros/rosconsole
+ dev-ros/roscpp
+ dev-ros/turtlesim
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_actionlib/turtle_actionlib-9999.ebuild b/dev-ros/turtle_actionlib/turtle_actionlib-9999.ebuild
index 14da5732c951..f546db76e3fd 100644
--- a/dev-ros/turtle_actionlib/turtle_actionlib-9999.ebuild
+++ b/dev-ros/turtle_actionlib/turtle_actionlib-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/common_tutorials"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
inherit ros-catkin
diff --git a/dev-ros/urdf/Manifest b/dev-ros/urdf/Manifest
index cddb25aa08ab..f5864bb0132d 100644
--- a/dev-ros/urdf/Manifest
+++ b/dev-ros/urdf/Manifest
@@ -1,4 +1,4 @@
-DIST urdf-1.13.1.tar.gz 43326 BLAKE2B dce42216cc21595b91964b970d45bbc79d8c144ee331f72e9c3d31f024f3c0f18e59563055df7c4e4337f5bf1361a838a07c80dabb100b7522999a0949384639 SHA512 8a27b0bff40cb42d5eeb62422c371a48c25e3f4513711b86752192b618ceec308bcebb1d52aa3d058448d30c6724cc2cc337f815b9043874793e82e6404d6648
-EBUILD urdf-1.13.1-r1.ebuild 695 BLAKE2B 9c98f0ce66f033828b0be3732e71d0cec2abf7cad91e21e936d845ff7d08e29da23b07c68b7c9e490a64feebcf67063ef4f043be61e8aff955685e659bac8564 SHA512 452eed5adccde1a48710ecebf859925eb3a65cebd7f21534f4f7c2c150997c617a9833964f91c275831704a428f5fcae9f8916c2cb0c294e75f3576ba915fc4a
-EBUILD urdf-9999.ebuild 695 BLAKE2B 9c98f0ce66f033828b0be3732e71d0cec2abf7cad91e21e936d845ff7d08e29da23b07c68b7c9e490a64feebcf67063ef4f043be61e8aff955685e659bac8564 SHA512 452eed5adccde1a48710ecebf859925eb3a65cebd7f21534f4f7c2c150997c617a9833964f91c275831704a428f5fcae9f8916c2cb0c294e75f3576ba915fc4a
+DIST urdf-1.13.2.tar.gz 43588 BLAKE2B f3e97170e1930361803be2c86322ab95b62bca519127bdc3ad73065d764eaca87c2790fc1d4823e53167c853c164fc1020e1f208b6e5af025b1bb96cc0420dc2 SHA512 d22e8a647a701ff18a446d9d92511a01266b8a34c11f9f238bbc79373fa3849ebc3a11a56fea7beb4a41f893ffa30ddd5e3a6361751a6d720de6be6c6184fe41
+EBUILD urdf-1.13.2.ebuild 664 BLAKE2B 4ba4144e766fe657bd64ae243c04d94638e4380d77eefcd39c46afc27af41643cd7173aa1ff439d43d7a1a4685621899cdec0e398eafded87ba2ce36b06bd778 SHA512 b223ff69b4da6dcaf62ae0b27e5fc23033e7e349a3ecffb39a4ea831e565d373932eb1c0d95f5fe52dc77675188b7ad52d565164fd84ce28ba38204b011f8506
+EBUILD urdf-9999.ebuild 664 BLAKE2B 4ba4144e766fe657bd64ae243c04d94638e4380d77eefcd39c46afc27af41643cd7173aa1ff439d43d7a1a4685621899cdec0e398eafded87ba2ce36b06bd778 SHA512 b223ff69b4da6dcaf62ae0b27e5fc23033e7e349a3ecffb39a4ea831e565d373932eb1c0d95f5fe52dc77675188b7ad52d565164fd84ce28ba38204b011f8506
MISC metadata.xml 322 BLAKE2B 113835aed7f5cb356ac6ebb2348a2215f2f253e7e0e5209cae6f9712d198486c8105073ada1cf53bc3ee2ce2631dc610d40a610e25da4796b9a1cfda3ec31b82 SHA512 fce96c81cd93f93d445aac4a6a7b376059f69cde1abd44d3fbc3e46ed3b3a9b68ab6db51b08aad817fe28201d1c2b7a1f1c07455caae903f948ac23950b9c221
diff --git a/dev-ros/urdf/urdf-1.13.1-r1.ebuild b/dev-ros/urdf/urdf-1.13.1-r1.ebuild
deleted file mode 100644
index e6840f8e198c..000000000000
--- a/dev-ros/urdf/urdf-1.13.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/urdf"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/boost:=[threads]
- dev-libs/urdfdom
- dev-libs/urdfdom_headers
- dev-ros/urdf_parser_plugin
- dev-ros/pluginlib
- dev-ros/rosconsole_bridge
- dev-libs/console_bridge:=
- dev-ros/roscpp
- dev-libs/tinyxml
- dev-libs/tinyxml2:=
- dev-ros/class_loader:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/urdf/urdf-1.13.2.ebuild b/dev-ros/urdf/urdf-1.13.2.ebuild
new file mode 100644
index 000000000000..13449642a2ff
--- /dev/null
+++ b/dev-ros/urdf/urdf-1.13.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/urdf"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-libs/urdfdom
+ dev-libs/urdfdom_headers
+ dev-ros/urdf_parser_plugin
+ dev-ros/pluginlib
+ dev-ros/rosconsole_bridge
+ dev-libs/console_bridge:=
+ dev-ros/roscpp
+ dev-libs/tinyxml
+ dev-libs/tinyxml2:=
+ dev-ros/class_loader:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/urdf/urdf-9999.ebuild b/dev-ros/urdf/urdf-9999.ebuild
index e6840f8e198c..13449642a2ff 100644
--- a/dev-ros/urdf/urdf-9999.ebuild
+++ b/dev-ros/urdf/urdf-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/urdf"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
diff --git a/dev-ros/urdf_parser_plugin/Manifest b/dev-ros/urdf_parser_plugin/Manifest
index bb15232a5aa1..b74b1a4c79f1 100644
--- a/dev-ros/urdf_parser_plugin/Manifest
+++ b/dev-ros/urdf_parser_plugin/Manifest
@@ -1,6 +1,4 @@
-DIST robot_model-1.12.11.tar.gz 277822 BLAKE2B 3bdd2b931ddfd062594ccb2be4ce6d4863a5fa66f538c3ee48c3600b3be249d267f9d03aa9a701bc6ab22c4297d659a24da668fedcd25c75fe128c43cc781be0 SHA512 8dea6fc72e9beaddbf9a82cb177561cb89c69ef8f58f0c4882598f6cc33a0e10564d9696f07b6f4e3e3404d3f1f5236e54eea4b8d249be0a216cd3ce12a03cde
-DIST urdf-1.13.1.tar.gz 43326 BLAKE2B dce42216cc21595b91964b970d45bbc79d8c144ee331f72e9c3d31f024f3c0f18e59563055df7c4e4337f5bf1361a838a07c80dabb100b7522999a0949384639 SHA512 8a27b0bff40cb42d5eeb62422c371a48c25e3f4513711b86752192b618ceec308bcebb1d52aa3d058448d30c6724cc2cc337f815b9043874793e82e6404d6648
-EBUILD urdf_parser_plugin-1.12.11.ebuild 359 BLAKE2B 7175e7cf30ba62e2a23e951b50234ed6786db1b4029b3fa6e5b3ffd402e27af6b9a061b1a02bd48e53600d4325b5f8126063b1d8ed1c51e238aa0c0e581a8771 SHA512 ee48574e3acef6f5b669d2895715e8a3b4fc831ef3419409f1a4cc68c04c1ce085fd108885522aed62bcb256ddeb2e62c4ce8c5d0ec68393245debfc96e555aa
-EBUILD urdf_parser_plugin-1.13.1.ebuild 352 BLAKE2B 35f46ddfd12bc489388092bc2a98582e9b5ec995dd8b499e78d13e7745492cc9569a8615552a3f710faeb63f289534ea80eca4464dd6df570c52dcca40224d34 SHA512 2145b589f3cc792b7d2dacc155c5143ef993b36d69cfb58f4ebb2cb7b9bb5a6d5a39311fc768925fea010b50c6aff94ae7031877ed350f75e6eb59c74a5ac6a6
-EBUILD urdf_parser_plugin-9999.ebuild 352 BLAKE2B 35f46ddfd12bc489388092bc2a98582e9b5ec995dd8b499e78d13e7745492cc9569a8615552a3f710faeb63f289534ea80eca4464dd6df570c52dcca40224d34 SHA512 2145b589f3cc792b7d2dacc155c5143ef993b36d69cfb58f4ebb2cb7b9bb5a6d5a39311fc768925fea010b50c6aff94ae7031877ed350f75e6eb59c74a5ac6a6
+DIST urdf-1.13.2.tar.gz 43588 BLAKE2B f3e97170e1930361803be2c86322ab95b62bca519127bdc3ad73065d764eaca87c2790fc1d4823e53167c853c164fc1020e1f208b6e5af025b1bb96cc0420dc2 SHA512 d22e8a647a701ff18a446d9d92511a01266b8a34c11f9f238bbc79373fa3849ebc3a11a56fea7beb4a41f893ffa30ddd5e3a6361751a6d720de6be6c6184fe41
+EBUILD urdf_parser_plugin-1.13.2.ebuild 349 BLAKE2B 5053898ad6814a286526be45e4e6fba56df3358bbfe5dba23721bb39675a6e0d9a39dd8be9ed4cc63187a7b0bd521e3bd185646e47b1fc483fe7fc500a2136c8 SHA512 8cb31ad4ae397d1eb6317004555ff290e40e7feac53f77574675eba5e02cfb57fb5c799e599c28abf5033726c63f672eba9ff8959b1e63132b3daa04769634db
+EBUILD urdf_parser_plugin-9999.ebuild 349 BLAKE2B 5053898ad6814a286526be45e4e6fba56df3358bbfe5dba23721bb39675a6e0d9a39dd8be9ed4cc63187a7b0bd521e3bd185646e47b1fc483fe7fc500a2136c8 SHA512 8cb31ad4ae397d1eb6317004555ff290e40e7feac53f77574675eba5e02cfb57fb5c799e599c28abf5033726c63f672eba9ff8959b1e63132b3daa04769634db
MISC metadata.xml 322 BLAKE2B 113835aed7f5cb356ac6ebb2348a2215f2f253e7e0e5209cae6f9712d198486c8105073ada1cf53bc3ee2ce2631dc610d40a610e25da4796b9a1cfda3ec31b82 SHA512 fce96c81cd93f93d445aac4a6a7b376059f69cde1abd44d3fbc3e46ed3b3a9b68ab6db51b08aad817fe28201d1c2b7a1f1c07455caae903f948ac23950b9c221
diff --git a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.12.11.ebuild b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.12.11.ebuild
deleted file mode 100644
index b711fa9ab4bc..000000000000
--- a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.12.11.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ base class for URDF parsers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/urdfdom_headers"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.13.1.ebuild b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.13.1.ebuild
deleted file mode 100644
index 4e2a5c3c7563..000000000000
--- a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.13.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/urdf"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ base class for URDF parsers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/urdfdom_headers"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.13.2.ebuild b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.13.2.ebuild
new file mode 100644
index 000000000000..ef001155f19c
--- /dev/null
+++ b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.13.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/urdf"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ base class for URDF parsers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/urdfdom_headers"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-9999.ebuild b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-9999.ebuild
index 4e2a5c3c7563..ef001155f19c 100644
--- a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-9999.ebuild
+++ b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/urdf"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
diff --git a/dev-ros/urdf_tutorial/Manifest b/dev-ros/urdf_tutorial/Manifest
index 599326830b3f..78e281a00df2 100644
--- a/dev-ros/urdf_tutorial/Manifest
+++ b/dev-ros/urdf_tutorial/Manifest
@@ -1,7 +1,4 @@
-AUX tests.patch 593 BLAKE2B c7597300a131235a1f60407d2123cdcdebb4e95328ba413b7243934a4401e084b814682c23ec58950db24f738b2a8e7064f62ab5784764461288de7b352cdcb3 SHA512 0ef25218dad5f9f4798557131cd10043b5ac3314723b2f6d2d2a5de961153748c8df955e14359338c289e1b3f20301beef173f5aa5d98524a612d9977d621406
-DIST urdf_tutorial-0.3.0.tar.gz 871048 BLAKE2B 2bca4409696011c75e7b6c1ae811fe4caec3fe34b28ea80c9774b6068c64509a97452173c1e43ba92f77081419b58bf5f6987e1e9941eca8ce077c534636bad9 SHA512 1518cd2aa783e92dd7a996b9cff9df37f21f7585d59b6001bd9a42782b2a5d81e96e8d2502955283f29390c7fc4944250ff1d954ab6e511e0886f243c4aabbde
-DIST urdf_tutorial-0.4.0.tar.gz 865626 BLAKE2B 42a8c3274e00393f846d4e2e9641740dad214bbcdc4f65095f96f2faac1f3709170d5719085d5927ca0c322f9b8cc57b2f8494353bec629978874870a8d37206 SHA512 256859d83fb5860df27cf8922043fb61158134c1ea06f3943fed3b8183c7384819a761d83bcb03a924a813185be07e89ca510076bfa1dfe4c2e52f561503fa88
-EBUILD urdf_tutorial-0.3.0.ebuild 538 BLAKE2B bb697e25127e767527bfec3300afa588fd4b0dff34a2a9e5145723e96465922f790d02a571dc302094f85dd9e43a84aa41b81636aeab91d0519d49ede897fe09 SHA512 214b1c36eb845b4a8606753163fb781cc3a0a0f2d4283d34c0f5499e6b478a8255d338a4c7b754c73a1a813a28168ca857ed7d22295745996b45a33e7fabd1e9
-EBUILD urdf_tutorial-0.4.0.ebuild 480 BLAKE2B 6a0825689ee5abba1ca565a4bac64b2671a991fedded31709728aff30a362b9588e74f39bec47001e739052ee7ace8cf89cb0c1df38e36988a5e13703c841db1 SHA512 5a01272a6a13efd6f309c3010b66d1f5cc70b8156d63a03c98dfaf22c1c3a6612ff0c65f47c4189717bf69cadbf00d86f4649fb23cfdaa49b19c9c15857efde7
-EBUILD urdf_tutorial-9999.ebuild 480 BLAKE2B 6a0825689ee5abba1ca565a4bac64b2671a991fedded31709728aff30a362b9588e74f39bec47001e739052ee7ace8cf89cb0c1df38e36988a5e13703c841db1 SHA512 5a01272a6a13efd6f309c3010b66d1f5cc70b8156d63a03c98dfaf22c1c3a6612ff0c65f47c4189717bf69cadbf00d86f4649fb23cfdaa49b19c9c15857efde7
+DIST urdf_tutorial-0.5.0.tar.gz 865623 BLAKE2B 15a8337ba15c7e94a661c72a562ab4a31ca470d5d2c995aecddea69611616a2671809e085aac2857d9d2a298d92f1b5d52c11859d39c41508d7927b3d18e9607 SHA512 70390e767d7b1ace1e52d5e78b0b6775800fdc5e12d52e56603505276a9da14204bb58d680e1d9748530d0821e082c772c948947554bf48c1a9cba814495e8ed
+EBUILD urdf_tutorial-0.5.0.ebuild 484 BLAKE2B 12408ac81f3ae486ad992314f5f632fac2fd1f1ed8ba26126237fc46b3e2b1fadf5a94041b1f57cd4e2d3f3006ca51affe3481f9964d754779bc09ece7017b66 SHA512 bd7e73b9244900fbcd17a0613d68fbd505296f05d2162c1a596c25246e8fae93abbcf6765795c638fa29456c4ba42e837369abe9d0307e89ce98efcad40f6900
+EBUILD urdf_tutorial-9999.ebuild 484 BLAKE2B 12408ac81f3ae486ad992314f5f632fac2fd1f1ed8ba26126237fc46b3e2b1fadf5a94041b1f57cd4e2d3f3006ca51affe3481f9964d754779bc09ece7017b66 SHA512 bd7e73b9244900fbcd17a0613d68fbd505296f05d2162c1a596c25246e8fae93abbcf6765795c638fa29456c4ba42e837369abe9d0307e89ce98efcad40f6900
MISC metadata.xml 331 BLAKE2B ef4364f8ec21105621d1d902a42bcd3c84797d9d72781e5fc1d5f80fc81cf5920aef1b68edd558a84510a3bfd8b1266f826c64d2e842c42b7006f980de8f1626 SHA512 b1e2cc797f0ddcd22bbc3c0c36c2339a95e66b05c1ac2042e7261fce8c9b55586aae1ee0633b98ead7eff51788f3debb5568c06567746af116665375f32b918f
diff --git a/dev-ros/urdf_tutorial/files/tests.patch b/dev-ros/urdf_tutorial/files/tests.patch
deleted file mode 100644
index b34f76bc4b8a..000000000000
--- a/dev-ros/urdf_tutorial/files/tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 3c068fc166d662d1459610a56dc955f3bf22f7fe
-Author: David V. Lu
-Date: Sun Jul 2 16:07:37 2017 -0400
-
- Fix launch test
-
-diff --git a/urdf_tutorial/launch/display.launch b/urdf_tutorial/launch/display.launch
-index 959946a..66a429a 100644
---- a/urdf_tutorial/launch/display.launch
-+++ b/urdf_tutorial/launch/display.launch
-@@ -1,6 +1,6 @@
-
-
--
-+
-
-
-
diff --git a/dev-ros/urdf_tutorial/urdf_tutorial-0.3.0.ebuild b/dev-ros/urdf_tutorial/urdf_tutorial-0.3.0.ebuild
deleted file mode 100644
index 1c6352b18714..000000000000
--- a/dev-ros/urdf_tutorial/urdf_tutorial-0.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/urdf_tutorial"
-KEYWORDS="~amd64"
-ROS_SUBDIR="${PN}"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="URDF tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/urdf
- dev-ros/joint_state_publisher
- dev-ros/robot_state_publisher
- dev-ros/rviz
- dev-ros/xacro
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslaunch[${PYTHON_USEDEP}] )
-"
-
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/urdf_tutorial/urdf_tutorial-0.4.0.ebuild b/dev-ros/urdf_tutorial/urdf_tutorial-0.4.0.ebuild
deleted file mode 100644
index 305da65fc713..000000000000
--- a/dev-ros/urdf_tutorial/urdf_tutorial-0.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/urdf_tutorial"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="URDF tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/urdf
- dev-ros/joint_state_publisher
- dev-ros/robot_state_publisher
- dev-ros/rviz
- dev-ros/xacro
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslaunch[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/urdf_tutorial/urdf_tutorial-0.5.0.ebuild b/dev-ros/urdf_tutorial/urdf_tutorial-0.5.0.ebuild
new file mode 100644
index 000000000000..40cde8934402
--- /dev/null
+++ b/dev-ros/urdf_tutorial/urdf_tutorial-0.5.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/urdf_tutorial"
+KEYWORDS="~amd64"
+
+inherit ros-catkin
+
+DESCRIPTION="URDF tutorials"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/urdf
+ dev-ros/joint_state_publisher
+ dev-ros/joint_state_publisher_gui
+ dev-ros/robot_state_publisher
+ dev-ros/rviz
+ dev-ros/xacro
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/roslaunch[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild b/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild
index 305da65fc713..40cde8934402 100644
--- a/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild
+++ b/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros/urdf_tutorial"
KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -16,6 +15,7 @@ IUSE=""
RDEPEND="
dev-ros/urdf
dev-ros/joint_state_publisher
+ dev-ros/joint_state_publisher_gui
dev-ros/robot_state_publisher
dev-ros/rviz
dev-ros/xacro
diff --git a/dev-ros/visualization_msgs/Manifest b/dev-ros/visualization_msgs/Manifest
index 9acab15ae2de..72f844101caf 100644
--- a/dev-ros/visualization_msgs/Manifest
+++ b/dev-ros/visualization_msgs/Manifest
@@ -1,4 +1,6 @@
DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
EBUILD visualization_msgs-1.12.7.ebuild 478 BLAKE2B 881bdd7cae315245dcff079e5b3fa50c27326904b96a4e8c67b3033340140df856dca8dbf70448ca0d386efd14f2226e4b10730234e7746250e783f71db785fd SHA512 0abdc457cfeafee77723962c922a047c3279a311ce11548c2c6097ca842bdce45787d7c03a8dfdfde95b119cad31917a6c549c2b6370c10100657a7dd92a83e6
+EBUILD visualization_msgs-1.13.0.ebuild 478 BLAKE2B 881bdd7cae315245dcff079e5b3fa50c27326904b96a4e8c67b3033340140df856dca8dbf70448ca0d386efd14f2226e4b10730234e7746250e783f71db785fd SHA512 0abdc457cfeafee77723962c922a047c3279a311ce11548c2c6097ca842bdce45787d7c03a8dfdfde95b119cad31917a6c549c2b6370c10100657a7dd92a83e6
EBUILD visualization_msgs-9999.ebuild 478 BLAKE2B 881bdd7cae315245dcff079e5b3fa50c27326904b96a4e8c67b3033340140df856dca8dbf70448ca0d386efd14f2226e4b10730234e7746250e783f71db785fd SHA512 0abdc457cfeafee77723962c922a047c3279a311ce11548c2c6097ca842bdce45787d7c03a8dfdfde95b119cad31917a6c549c2b6370c10100657a7dd92a83e6
MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/visualization_msgs/visualization_msgs-1.13.0.ebuild b/dev-ros/visualization_msgs/visualization_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..2532363c374c
--- /dev/null
+++ b/dev-ros/visualization_msgs/visualization_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages used by higher level packages that deal in visualization-specific data."
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/xmlrpcpp/Manifest b/dev-ros/xmlrpcpp/Manifest
index 5363a3a1037a..23193e3851bf 100644
--- a/dev-ros/xmlrpcpp/Manifest
+++ b/dev-ros/xmlrpcpp/Manifest
@@ -1,4 +1,6 @@
DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
EBUILD xmlrpcpp-1.15.4.ebuild 369 BLAKE2B da4bf959669d93ae24d44dbb2cf6470d01c13e401cf592bcc800fddfca951e782af24233a6c0e034107d986d58c549d373f4422e36edc759dd1b11b2b982c3d0 SHA512 bbe65fcc0140d24d41a0d557e6d7402dc98ba2001820a99eeb44f108af452407a125a48b536151c69f917b71d30b59938e0f08dac42b566cb86425ab3787335c
+EBUILD xmlrpcpp-1.15.7.ebuild 369 BLAKE2B da4bf959669d93ae24d44dbb2cf6470d01c13e401cf592bcc800fddfca951e782af24233a6c0e034107d986d58c549d373f4422e36edc759dd1b11b2b982c3d0 SHA512 bbe65fcc0140d24d41a0d557e6d7402dc98ba2001820a99eeb44f108af452407a125a48b536151c69f917b71d30b59938e0f08dac42b566cb86425ab3787335c
EBUILD xmlrpcpp-9999.ebuild 369 BLAKE2B da4bf959669d93ae24d44dbb2cf6470d01c13e401cf592bcc800fddfca951e782af24233a6c0e034107d986d58c549d373f4422e36edc759dd1b11b2b982c3d0 SHA512 bbe65fcc0140d24d41a0d557e6d7402dc98ba2001820a99eeb44f108af452407a125a48b536151c69f917b71d30b59938e0f08dac42b566cb86425ab3787335c
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.7.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.7.ebuild
new file mode 100644
index 000000000000..605e02ba7813
--- /dev/null
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of the XML-RPC protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/cpp_common"
+DEPEND="${RDEPEND}"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 9f11319e5e24..9e4a34d15916 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/minitest-global_expectations/Manifest b/dev-ruby/minitest-global_expectations/Manifest
index 276c2b3391bf..10356f840f04 100644
--- a/dev-ruby/minitest-global_expectations/Manifest
+++ b/dev-ruby/minitest-global_expectations/Manifest
@@ -1,3 +1,3 @@
DIST minitest-global_expectations-1.0.1.gem 6656 BLAKE2B 19df8ad02f9dad9711e219389fa2d0114d1b2b07b3d7e263eb69e48d78596184261c5de91d3f03d996bf45e897d1a7ac6bb3efb77cede34203f6712263eb573e SHA512 e63b50b02612d751b1bd0b3c9e100e0f6b674dfa5475434a213f78c5e556004c43f00b9bf5b9c479c2381be87015125a334308fae27d70a6aed1e9b392ece546
-EBUILD minitest-global_expectations-1.0.1.ebuild 406 BLAKE2B b89fb6c562bcabffbc9ac254a00b0c2e61e56d3072679b3a7a9bc05b785e2090a16b64239392397c78aa13d26068244a34341a34eb241e69ef827328cce7b07b SHA512 26e787f91ca6c1e4c035587f08ff62f47c8538d58d02d9499f96144f82978b4f4b806fbb2ae6b5ea1fa6a6dda068919ca5f2c494b0f13312733f6301cae6fa62
+EBUILD minitest-global_expectations-1.0.1.ebuild 405 BLAKE2B 046d98e62ec20f93cc1df9efb8b3ede4e0e9057213a4af9b980b54eb60df833f7b346980420fa3de2b78dc95c75e52c55a166d8dce99543c659f5487c801b30a SHA512 4f924bffd271dfc1ad5c62ae1dd79c1751e4912e1e07cac34375deef1861a656b3d2503a6be351db7ea3ed1b50366f966090aa03da6550cc8ee52bb93f135be6
MISC metadata.xml 366 BLAKE2B 851420e93e857c2d26c11ed324a9db64306ffe71c00e1397f8c2f3eda2896f6ee63073be3bb131ddbd3a9e580fe35bbe0f6375438b34e2ecbd0e2527fc5e9fe2 SHA512 3e762503c0ee2cb739096beef82fae8686304a3c1a4f47a26d9326105b740ef5b0110baa5f108f41f2709c8558667175cb0fa214c0a726e1cfc676b74cb4209d
diff --git a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
index 485e9116130f..3a08585160fa 100644
--- a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
+++ b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
@@ -11,5 +11,5 @@ HOMEPAGE="https://github.com/jeremyevans/minitest-global_expectations"
LICENSE="MIT"
SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
IUSE=""
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 1710721875bc..cdfb0911ed79 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -5,9 +5,9 @@ DIST rack-2.1.4.tar.gz 251772 BLAKE2B 9dbd1ac1dade5935a3819b8c23e492b3e637ed2fc9
DIST rack-2.2.2.tar.gz 277961 BLAKE2B 5823084cb8b2f66bf46f46d460e93ffc1817371d0cffd711675f5c84e934c5ac5d2a8818d7665eba2490f672344995e3ac54ac8b1dc6d891e800d049ad0db92f SHA512 d0d27d091584b6cabafaa1d1053e013bc28ac0dc7da7b5bf28e528f5479091db1c896052a4ffe75be22011d3bc35c41ce73514a47e66b28ff8d3b723c46fd42c
DIST rack-2.2.3.tar.gz 278045 BLAKE2B 2182ab6ee2ca0e40bd131dc96cf15d7e1015570a0702c2419e50da9eae6afedc0f1543a2fdc1fb32022a65788ab486b7add688c8bf201ad46a3d101b6e625a8b SHA512 0daefd1fd7d1c83a5aaf0e8a3c0d734f805f6718c3f2d20673e78242f10fa99c24f8e8d480cb7f0ee299d96a4b691e4a19c967785de946dc863e9b78e0c3ac53
EBUILD rack-1.6.12.ebuild 1691 BLAKE2B 27974bc4f722c22e14cab0486e18c45ea52840898e4db6979f337fa0efdf77f8d160d73ac42ddc668b7fc41c6d726ed9f6e0533f3632483670ab44a9b71e14c7 SHA512 2c68b3554715800a3d4c299d9c655618b369540925922418bc6d233da6d363a39d2eccc72d652900e4da8154a0dfeef2896cd40819e23096cdbf7396d5497f34
-EBUILD rack-2.0.9.ebuild 1452 BLAKE2B f7c0df63a2ebab1e8bc2487beeb8e191dd6c267b9a8689ede3ffd5d0658a6b028f3855320c72042a6f68a033d1335bf3d50a51bc15d11075ddf319e71e7069a7 SHA512 13a6fca9994293d30ffc1bf1c387af2ca976fc8209da73b77b2edf4ac3efa4ae7641851172f4278cf8b7bc0f05b52bc215e9dc7e699440c593925634eab7a658
+EBUILD rack-2.0.9.ebuild 1450 BLAKE2B 6456a60357c016cae4274e327af3465a8d1de1cbb11915e60976e41f16a9fd551699e1d5ab4968b7f524779ca4844c73965dd9cda8c5482a9c01afbc885bdbf1 SHA512 ca8730370e993351a3b99b9d875d62d4670cb01083167318006f2007860c7c33346d0a6c682eef264e92bbd912b808fdc560dd754a3718a2c08076b2214d5ea9
EBUILD rack-2.1.3.ebuild 1705 BLAKE2B 72a4ad7411bf6616aff6538713d0de91dca6d5666897ef6e8076694b18aff80949b3a2401a7c5889d3015ef35242657db50bd2f220daf4602b12c34570f5aaca SHA512 2443d6a83edfd1a7e4530e13b710e7cd6ebdea5b05a2027297548565614df44bf3477c4b4473dff24c40bb77fb610464c512ad1f50385c6f7815f446c1c4827b
EBUILD rack-2.1.4.ebuild 1698 BLAKE2B 19566995b14950f7d79dc361a5170ec56df9b7a8900c658de03e5f47e3344355e96733dac9113a90245545f4c7cc3d053db1ee7877acf2750c858ce17eeb6546 SHA512 f7af118477ae7fce8fccb8c25258f6357cc7159e548f1dce89f35041c6a5172eee018f425d480b0d2511859b68973f786d3963fa74e660b2ea8d5bb6cec53be8
-EBUILD rack-2.2.2.ebuild 1502 BLAKE2B cd6f06aadf0fb8b10278d166eadd10399c1c81ecb8f3b2aa7836544ea500e338a7e81c66059061820189afe1ff8875bc75d0b360bcc7281478f0af3b728e6a4b SHA512 6cf95c001c770aaac7c3202332307eabd81000f27d2a921d070e84a5d8e18f86753d0427d8ddabbe6f83379fa42cd2c607ceca245902fe8be78f4ee9bce9d837
-EBUILD rack-2.2.3.ebuild 1494 BLAKE2B 973ee0c8aa2b346c87ac82504e738884d3e9907823689c7ad192888bde291fbf024583da83fc6152fca1afb3d2ab1bbec552b6dcdb00822363f1246e92255127 SHA512 ee5be0a4d03e3f9272fed5837d285b51b74990ff3a4e751ddfe43df7fcb3ef9bd2248a568758efd364041759fabf30332c20b9cb231049eb3f67cc5b8d582938
+EBUILD rack-2.2.2.ebuild 1500 BLAKE2B f52469ad493220c3eada44f43ed7ed2ab6c41b8ef6f5f325acf56fefb67bfc63451e3d17c75662a1470ff214dfea91f54cf39217a44f9775bc3818393b36bcb4 SHA512 8224db5007c1463599eaf8a2efcfdf8010c17a50a6305a08dd51059ecfabfd8c762d13ec3f817e42f7a512773e42563c1854b4bb637501c83cbec3b1445eb3d9
+EBUILD rack-2.2.3.ebuild 1492 BLAKE2B f6fdf74688b6b3c4f7196c264330b97d70e3168958d1e689075465b866317fff56f98e9317b6de9f38571a3c4ce453f5138da088c6a23444b0f17b65bb2c71c0 SHA512 45a91088d923784cc6ba264643b0f57c8ecfcef5e2d18951bf7e0914a724fef8ace8f3f0dcda0f5c48069886ca12005346f20477836177fe04cf9214824fb98d
MISC metadata.xml 391 BLAKE2B 5ed2f863a5fd68cf57f25afc2c2efa63df1eb25c4e01087130f70edbbd1b79c655ff7455b73ecdd31e083cd35381331fceef52856f946d24fc3d313705fbaef3 SHA512 7ffff4c4cc64855b0c95e2364fa9cfd1e3b06946155cc8244444f5f4e450abda8d8387aabddc224b94a55ff3d5e42391970e5541923e5aae24f408113a65a5c7
diff --git a/dev-ruby/rack/rack-2.0.9.ebuild b/dev-ruby/rack/rack-2.0.9.ebuild
index 36f685a9681c..3995c1e42f0b 100644
--- a/dev-ruby/rack/rack-2.0.9.ebuild
+++ b/dev-ruby/rack/rack-2.0.9.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://rack.github.com/"
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rack/rack-2.2.2.ebuild b/dev-ruby/rack/rack-2.2.2.ebuild
index 74779c85b94f..790fae7dfd87 100644
--- a/dev-ruby/rack/rack-2.2.2.ebuild
+++ b/dev-ruby/rack/rack-2.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
IUSE=""
ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rack/rack-2.2.3.ebuild b/dev-ruby/rack/rack-2.2.3.ebuild
index 5f36fbf2af17..3d0141b218b6 100644
--- a/dev-ruby/rack/rack-2.2.3.ebuild
+++ b/dev-ruby/rack/rack-2.2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
IUSE=""
ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index 70e8247d6f07..37a32e3ee5c5 100644
--- a/dev-ruby/rake-compiler/Manifest
+++ b/dev-ruby/rake-compiler/Manifest
@@ -1,5 +1,7 @@
DIST rake-compiler-1.0.7.tar.gz 33444 BLAKE2B c3a92206d4d7defdf21295aaf094f704596962a3ee79c3517ea1058732e1f9f378b5f14bbe3b9652572564d11c566e26014e187dcdb488409bf95ea9a52e0a7c SHA512 fa901f5cc48891f07bd8d9a27cf4e745e87d5a667dbee0c9f4b43f9564fdfe3067b9c658f10ea8bcacd32ea7320a542ef0fca9373147057472f5572a4a4c5268
DIST rake-compiler-1.1.0.tar.gz 34819 BLAKE2B ec4fec1eb92031f9f6b378b190c4e8a2f2627623afd6fb11922f71a93431de94bce640863deea2aab05656612533ee2b110f295f87590b48500583af71b08dae SHA512 77338776506df66c2e99e9b1b82dc4d54cc4e7c8fdb1f8b7b6d7507b9f9cb0718839e5139e9c0cb6295259e819dc8a011101e2427cdd387b568b639889321d60
+DIST rake-compiler-1.1.1.tar.gz 34692 BLAKE2B c6862f24ec57c25fdeb7faeeda9eb96cb64ac972c852a81b77ec9b35d21018a5647089cd38d80b03a79e2c07d3f9af42bbaf9998457ad3beed27c8285c23689f SHA512 e9cf9752e48eae912657a34d2f86a2b41f7d57620c6e43b1fa6fb8e5715336b2fdf99bf20a4851889e8b9b7b2e834421c13e108c538abdc3cec968952345361d
EBUILD rake-compiler-1.0.7.ebuild 1423 BLAKE2B c5893a5d99de366b4c86d631dd553b20caa3e4f3086a8e802039933dd2021ef6f7bfaad4acfb13e80262d16dca69006fcdfdc27c88212e2e8b5df60f19c44cc7 SHA512 fc0aa2f699b832f152719b4748ea17d1ce9ba51d1a7549b3fcda6523047430385d26fddf1f6db3a21ed12dc46d73c7c19131c1ce1b7ab089449ddf2bad853380
EBUILD rake-compiler-1.1.0.ebuild 1475 BLAKE2B 7bb5a1fa35c32f9764ed434444c0143eda418856100e5aec2bbd54a79af9db88abf092080197c8b0c6e31315184e9ad24641607dd3b1d40103a6cc09c03ea135 SHA512 25ac756511f204ddcc845021d9e66a7eb0d7c58e6ada35b4ebb51143e37dbe3fc0b3967be643d6547bcc459411e3cddcd85b328f3a7ba6549f369705b70ac0be
+EBUILD rake-compiler-1.1.1.ebuild 1458 BLAKE2B a09694059f53ba269df39e4e5f46c09a094810b2c10e943859bfac25cb9ac160ffd879957ce9c535c6f8c355ae61d96d098e8683a03a1e0fc91ffdcec89253ef SHA512 5a70c77be4075ee4ed11b7cb2d89ccb05ff1c9d2678f50d2c1019969315df0c57e79b89e2024c25383a62891675bfbfa1222926c878bd174d725d8c116d4bf74
MISC metadata.xml 350 BLAKE2B 35df0cbf74d904e36dc5b5f34c31a41bf9659942415655f635a112d01e98833babfd42640d5155392f5563fd1756b104671348c077e8a62a2d6efaa68389a3f3 SHA512 2f027e154015dbb7a0535356a313b2f4bada336f6c1549aea9db77f57b43ed7ff19408e3ba507010d50e0953f5f6fd51d9bec956653725e1e087d94a6ae3eb83
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
new file mode 100644
index 000000000000..87dee3f74ea7
--- /dev/null
+++ b/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rake-compiler.gemspec"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
+HOMEPAGE="https://github.com/luislavena/rake-compiler"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rake"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+USE_RUBY="ruby25 ruby26" ruby_add_bdepend "test? ( dev-util/cucumber dev-ruby/rspec:2 )"
+
+all_ruby_prepare() {
+ # Make sure the right rspec version is used in cucumber.
+ sed -i -e "1igem 'rspec', '~>2.0'" features/support/env.rb || die
+
+ # Avoid failing features for native gems, this also fails with rubygems
+ sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
+}
+
+each_ruby_test() {
+ # Skip cucumber for new ruby versions (not ready yet)
+ case ${RUBY} in
+ *ruby25|*ruby26)
+ RSPEC_VERSION=3 ruby-ng_rspec
+ ruby-ng_cucumber
+ ;;
+ *)
+ RSPEC_VERSION=3 ruby-ng_rspec
+ ;;
+ esac
+}
diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index f9cb9b88ce68..816ee31ebcf2 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -4,5 +4,5 @@ DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3
DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
EBUILD rrdtool-bindings-1.6.0.ebuild 1367 BLAKE2B 3455abcee11a899fa33f558abe25e91658537e5a62afa1b50500bed126baf1d1f3f28542ae60ad2105a199565b0186453eea73d804ae50015e88b2210ab449ad SHA512 5e3215de973ca0445d5342eb54f81fe775dbbee389f725c43e04eb90926462cda1263d9f6125caab6a6af835108a2ec0676de1a01d66f36cd1e3bc55e07c8590
EBUILD rrdtool-bindings-1.7.1-r1.ebuild 1381 BLAKE2B 3b3c799c16670c1aa030a38297418c72b7a7400870dcbaf3b21612e11aac4d1fa3588e199d62ec9f60def083d498dca278e22305762fa6daaa4eeab00fd769ff SHA512 da3f5306267fbe335c6dc74f7a49e6e187af0c040a0d78dc9f7e3e8fcb13be50bd607b8bcb3027e022bdca4103449baf1e5e119e48fec7f458933e29dc9bc3dd
-EBUILD rrdtool-bindings-1.7.2.ebuild 1391 BLAKE2B 1a2204d64e87155f408e6ae1564efc27119f58f89b365b4fbfe141275631e027065d58242496ad1cc826a00f1c51dacadb489d54de393dd47bc0136504adfea2 SHA512 d7d413a5ae09e271468bcc8934e41e2a39c8799273736a52e6e724e9db8f56f16886e519c3350f51432fb0aace16004e835ad6cf9449c3fa2daae19714ac0055
+EBUILD rrdtool-bindings-1.7.2.ebuild 1390 BLAKE2B bfc1a39f7ba9155848476e5386535a0cd3174f6c61867823ba42f4710bd18ae23bc3d7444a5129f24dc0b806828c5df3d665a4a0e360f2133584fa9e1540920d SHA512 606f37a3c81b03e398102044bc173b79647bffb4dd72099b083a3f048163a943f734c12213ca8bc353e0ef53ee2a824532f24f2eafaebd5de0b54fed9698ef1e
MISC metadata.xml 463 BLAKE2B edb3b1f3703163a7f6c28ea7d16a79158d108721a2a775e30967885fb6b7b31d6074585951cc5b1c7b640c88b0694b95f0aaf62b71df43a8d6d6a0d6f78e07c9 SHA512 60732861cde4604b50875b6bbba205f232a52c4d91e6e21bce49a46bcef824bc542140e73b07ce4c18518a366ff8c9bd34569895741b0ac292124f43b0f02aa1
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
index ff836e1b91e6..e07e633cad29 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
@@ -16,7 +16,7 @@ RUBY_S="$MY_P"/bindings/ruby
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="graph test"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( graph )"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index fb249743536b..f5906ef5a3ae 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 8f2def736cb2..5e28429dd96c 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
-DIST clion-2020.1.1.tar.gz 510085810 BLAKE2B c80b1dd6c88e89803f73dc22cf6d942a783a4d8a607904ffe44b445ab998f9f7db4aa6233305e617cb91608934ec86be208d798f512a849dbf98738293f8ff73 SHA512 3807d651b8b5b1c8c30658514f3aa376019bfebefff724375ae54d9105fcd9db370023906b51af2debcf83d26cebb060c88e228e7b672ad181e73a77d1ed4016
-EBUILD clion-2020.1.1.ebuild 2179 BLAKE2B 198748c33f57fedf4153c6f1d5f3982a901cc951d95e9b9e8c49d716e5ced2cbbac6bae3f186d76b84e3ea5d4f4c4ee33c3ea657c6d4b936120d66d08fbd2252 SHA512 0c223ad5cd9536eaf96b3ff9ad7deabe9f04124cf1b66b009168f676907da8c0e9d5939e428bb9f8baf1d26b48bc0c810f8b1e5abf3b4c3691f02a74116356d3
+DIST clion-2020.1.2.tar.gz 509953307 BLAKE2B f4f3ed6478b8b17e7efa14932156da8087c71b850b2b08340b3d5fc9c39d84c547bd8d2ef194117609a6e9bcb85396796661ad70beb478a0579a85a25ec5d503 SHA512 68348a20a18f681298e0e1207c1794a437d58dd52d700ed7f3935e2434672b7648b0e6414b25e32fa3929a9c6973dd3024448dd514ffe05690826d02760fa4c3
+EBUILD clion-2020.1.2.ebuild 2179 BLAKE2B 198748c33f57fedf4153c6f1d5f3982a901cc951d95e9b9e8c49d716e5ced2cbbac6bae3f186d76b84e3ea5d4f4c4ee33c3ea657c6d4b936120d66d08fbd2252 SHA512 0c223ad5cd9536eaf96b3ff9ad7deabe9f04124cf1b66b009168f676907da8c0e9d5939e428bb9f8baf1d26b48bc0c810f8b1e5abf3b4c3691f02a74116356d3
MISC metadata.xml 458 BLAKE2B 1393fb2b8c1487a670f3c2fc7c2fe9246d8f18bc7d33e2d494f0ffc3a3492285dab041f3cf810d16e78a312dd3936eb9bad0838ff9a8c3b6a4b7d80b90764fc4 SHA512 c00a66b6722a62222d06c325df55a3d946267ce7a4a452855933d721b936cd05aae5e9acdb784fc8e97235ead35e6625522c579397f43e9755619b1a8dcaccc7
diff --git a/dev-util/clion/clion-2020.1.1.ebuild b/dev-util/clion/clion-2020.1.2.ebuild
similarity index 100%
rename from dev-util/clion/clion-2020.1.1.ebuild
rename to dev-util/clion/clion-2020.1.2.ebuild
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 610fd9597d45..59637cb865b5 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
DIST debhelper_13.1.tar.xz 530828 BLAKE2B 582dccdad50a51907d2565fef34fefeebf79360af31691ad0c332bb04b12a2165af598a3d35088595aee3653ca27f049e22669236ee48376ab665ea7423c6d5e SHA512 8160a31a857c9e548e0c5527eb4c86fb5c452e5209a741c7a4600f03a48fd5b46fe07c4d1c64ad11c3af3b9f2e1d67df2d4e9d773bc432d6147540dab015e977
-DIST debhelper_13.tar.xz 526028 BLAKE2B cc6e5f7b2eee7822088e326c3bd3930c3da60a5942c3dc3732a787428bf43c985a2f2be681b6d85c88767e3b1cde3871db1be5b912ab35260b776924c54acfb7 SHA512 17e131fba58057383e7824cd93a27b9d7eed0a2191bc6499c4bc412b47889a91d53a6ad5ac8c637166748bd728f10fd5d3a83bd0d2626e491a8481fe5c1193e9
+DIST debhelper_13.2.tar.xz 540400 BLAKE2B a1734ecbd92eadc3f5fbd0b118ffb4c6b697b157c39cab7626bd734adb80c6dfd0061298220c5d5c7a7fff412a1a52490e7001c8d634596dc41389a7e81c7a74 SHA512 07fd1f32975a9d84940a15140875994d30fe4bc0a40b40fe83a1ff9a304121167345194802691326251490852e601c388cab5cd02c000a4a6768edd1259a7bbc
DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
EBUILD debhelper-13.1.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
-EBUILD debhelper-13.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
+EBUILD debhelper-13.2.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
EBUILD debhelper-9.20160814.ebuild 1530 BLAKE2B 8a4529891546c0553fc545b41c0721ab899ff6f62ca5b71e8950c306bc5bdb6f9971fec6534c3b4aa03270154290e6e41b91916deb67a58f6a5fce24c57cca9e SHA512 b466001b990d497caccfdbbd88cd6e28e2e55e399923b33d1050bf667d7a050ccede8c4c2bf2df7460177d4a2094247e2ffcfd34c29d580f40ab432e89a96525
MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-13.ebuild b/dev-util/debhelper/debhelper-13.2.ebuild
similarity index 100%
rename from dev-util/debhelper/debhelper-13.ebuild
rename to dev-util/debhelper/debhelper-13.2.ebuild
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 7b15f3ebf878..9de1746b3a6b 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,10 +1,8 @@
-DIST ideaIC-1.0.201.6668.121.tar.gz 524536881 BLAKE2B 645e7c0390d89d0e0f1710682a5608dc226154e83ea7368434cf5da61f73064467fe7884d90c13d0d33b8feb0a237ca83446a155a135e3884bdaeca5254191ae SHA512 e2688788188726e418cddeef2bf46a54e8b1bcf4770d7daf5b2ee0d1de7d5ab9c84fef0078622b17e884d9b9cb5b826873b4c120aaec3c592e18ee2ddca2c7f6
-DIST ideaIC-1.1.201.7223.91_20200507.tar.gz 529101163 BLAKE2B a8f7847c6fb673a58678f02c1933ee1d6a3a89946583c9488d30bbcb320c743694c5bd8a6d53f327ffdce602f93c92e6c17396af3ab4e235b24f28eaa77342ee SHA512 f272cc8ef90fb4c0ac5fba905caeb459e9657a0f4f643c8e19e5330812477acb57e558808d290ad6e9bfe9c5835d700b59546f57733310e629915c88b2533304
DIST ideaIC-1.2.201.7846.76_20200507.tar.gz 529076492 BLAKE2B ec93303776324fca08db6e0a0e8058cdc4aa009852cf02beeb27193ea479845319f7b9a11983d56b10b31e280f4da5bfc6f43c802d42fa3c85d43ccbaa67a965 SHA512 59a6e87788dd0776ed11e882ae3f0b9e18f63d899602a4c576f946a7979d895a8750af20947f6273db8fde3fccce05cbd5b6bd4c0142450935d0abaace405679
+DIST ideaIC-1.3.201.8538.31.tar.gz 529511746 BLAKE2B d6eb9a4bc333136475432110ab767efd763d4631379f811a8b9ce70b415d621936630b1e0db55c90f572862176db40b50c76c34d1a179927d1ec7d234b6dc137 SHA512 34dcb365f0c1cd7362cd4660677e25b333557f1440b6835bf42ad365fc660849daf6733f09b1fc7aac8046752532c5a3f329656649708f629a812aa8989df50e
DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34
DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2
DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9
-EBUILD idea-community-2020.1.0.201.6668.121.ebuild 4754 BLAKE2B e737eda8211926ecf893c02036c4df691fa46d530ec2f874d9ebd3540c0a386b82aea8292698f501f2951e6d0fe58c801221306cfe3f62f74ed144457cf50523 SHA512 f5dda7212751fd6895367c13604951d47481b054ccfd313a32b4969797b50f28a14aee04382ae650fbb02dea2af01e4d55e5bca1ed7d0eb7295d5f6e6d8d5c1d
-EBUILD idea-community-2020.1.1.201.7223.91-r2.ebuild 4626 BLAKE2B b1e6ee9900b72d2d8e269dbb3a57058ce0ea1345c087c109f14e91c16c4a21795aa2a9975154c5af7be65d091434b2b7bc5c6bb0212a3224f2cfe11f8155b8d3 SHA512 29695b8ad20ec9d14922c3b8fd33f75215f3c2af880f9ab605cb956bf0e1432a8014cc0b2b8216bb6a1464fc3dbafd8e584b915d49eeabb433692fe5a8daaf7f
EBUILD idea-community-2020.1.2.201.7846.76.ebuild 4689 BLAKE2B 76ebcb168c22aa99bb66c9dea40ee73827457174ccd522fa9783e7ad2464f309813ac584734ad3910fb430a6ddc96896d53c750aa492bf921e5f4b4e41595d7d SHA512 50b38ae228d237ff975ecb824c585f8b97a024952d2cc5bdc02e2b45a7421831bcaa41c35472ac168151b4dedad9833eb25c6aedaa2169ef037ba1c6e5036f88
+EBUILD idea-community-2020.1.3.201.8538.31.ebuild 4680 BLAKE2B b4f8da2b8123efc110617da8482bc52b2406d4cca6a7839fabfdb44300eaa0a7ceea9bdcfae38502a2c6a009dae0bc1917c09aa33f8b4db4b4276ff4927490c3 SHA512 3be6b706d823ec989e1420a4f41863065b20c8ff57f5cd2538be9572b2ed477fa79440a6450c45a03b158ee5c658b21834a2147bab06f81b2cc2e939e66a7311
MISC metadata.xml 758 BLAKE2B ab45d0a8508bed2b64d02ca83d0aaffab9dfceb13a6a188accbb18f0648593ef1a9cfa03f375292b9858c05b17f003f4c6c2261b9d962ddaf679eebe7cea2eda SHA512 15ad0429ec342e939f3406e83b736ec9a273cb4ba33998a83584cee7af4ad0433a5a4758c8d01feb24efef51e4a4d9761db18d0bfc054bf9a0980ac8806eb459
diff --git a/dev-util/idea-community/idea-community-2020.1.0.201.6668.121.ebuild b/dev-util/idea-community/idea-community-2020.1.0.201.6668.121.ebuild
deleted file mode 100644
index b394855414db..000000000000
--- a/dev-util/idea-community/idea-community-2020.1.0.201.6668.121.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-2)"
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
-# available separately
-JRE11_BASE="11_0_2"
-JRE11_VER="164"
-JRE_BASE="8u202"
-JRE_VER="1483.37"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
- # upstream EAP
- KEYWORDS=""
- SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
-else
- # upstream stable
- KEYWORDS="~amd64 ~x86"
- SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
- jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
- amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
- jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
- codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 )
- jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC
- JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
- MPL-1.0 MPL-1.1 OFL ZLIB"
-
-#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
-#either (or neither) bundled
-#Defaulting to jbr8 to match upstream
-IUSE="+jbr8 -jbr11"
-REQUIRED_USE="jbr8? ( !jbr11 )"
-
-DEPEND="!dev-util/${PN}:14
- !dev-util/${PN}:15"
-RDEPEND="${DEPEND}
- >=virtual/jdk-1.7:*
- dev-java/jansi-native
- dev-libs/libdbusmenu
- dev-util/lldb"
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-# jbr11 binary doesn't unpack nicely into a single folder
-src_unpack() {
- if use !jbr11 ; then
- default_src_unpack
- else
- cd "${WORKDIR}"
- unpack ${MY_PN}IC-${PV_STRING}.tar.gz
- cd "${S}"
- mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
- fi
-}
-
-src_prepare() {
- if use amd64; then
- JRE_DIR=jre64
- else
- JRE_DIR=jre
- fi
-
- if use jbr8; then
- mv "${WORKDIR}/jre" ./"${JRE_DIR}"
- PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
- else
- PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
- fi
-
- rm -vf ${PLUGIN_DIR}/libavplugin*
- rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
- rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
- rm -vf "${S}"/bin/libdbm64*
-
- if [[ -d "${S}"/"${JRE_DIR}" ]]; then
- for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
- do
- if [[ -f "$file" ]]; then
- patchelf --set-rpath '$ORIGIN' $file || die
- fi
- done
- fi
-
- patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
-
- sed -i \
- -e "\$a\\\\" \
- -e "\$a#-----------------------------------------------------------------------" \
- -e "\$a# Disable automatic updates as these are handled through Gentoo's" \
- -e "\$a# package manager. See bug #704494" \
- -e "\$a#-----------------------------------------------------------------------" \
- -e "\$aide.no.platform.update=Gentoo" bin/idea.properties
-
- eapply_user
-}
-
-src_install() {
- local dir="/opt/${PN}-${MY_PV}"
-
- insinto "${dir}"
- doins -r *
- fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
- if use amd64; then
- JRE_DIR=jre64
- else
- JRE_DIR=jre
- fi
- if use jbr8 || use jbr11 ; then
- if use jbr8; then
- JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
- else
- JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
- fi
- if [[ -d ${JRE_DIR} ]]; then
- for jrebin in $JRE_BINARIES; do
- fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
- done
- fi
- fi
-
- make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
- newicon "bin/${MY_PN}.png" "${PN}.png"
- make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/" || die
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/idea-community/idea-community-2020.1.1.201.7223.91-r2.ebuild b/dev-util/idea-community/idea-community-2020.1.1.201.7223.91-r2.ebuild
deleted file mode 100644
index 3cbd1755d15b..000000000000
--- a/dev-util/idea-community/idea-community-2020.1.1.201.7223.91-r2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-3)"
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
-# available separately
-JRE11_BASE="11_0_2"
-JRE11_VER="164"
-JRE_BASE="8u202"
-JRE_VER="1483.37"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
- # upstream EAP
- KEYWORDS=""
- SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
-else
- # upstream stable
- KEYWORDS="~amd64 ~x86"
- SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}_20200507.tar.gz
- jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
- amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
- jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
- codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 )
- jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC
- JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
- MPL-1.0 MPL-1.1 OFL ZLIB"
-
-#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
-#either (or neither) bundled
-#Defaulting to jbr8 to match upstream
-IUSE="+jbr8 -jbr11"
-REQUIRED_USE="jbr8? ( !jbr11 )"
-
-DEPEND="!dev-util/${PN}:14
- !dev-util/${PN}:15"
-RDEPEND="${DEPEND}
- >=virtual/jdk-1.7:*
- dev-java/jansi-native
- dev-libs/libdbusmenu
- dev-util/lldb"
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-# jbr11 binary doesn't unpack nicely into a single folder
-src_unpack() {
- default_src_unpack
- if use jbr11 ; then
- mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
- fi
-}
-
-src_prepare() {
- if use amd64; then
- JRE_DIR=jre64
- else
- JRE_DIR=jre
- fi
-
- if use jbr8; then
- mv "${WORKDIR}/jre" ./"${JRE_DIR}"
- PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
- else
- PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
- fi
-
- rm -vf ${PLUGIN_DIR}/libavplugin*
- rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
- rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
- rm -vf "${S}"/bin/libdbm64*
-
- if [[ -d "${S}"/"${JRE_DIR}" ]]; then
- for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
- do
- if [[ -f "$file" ]]; then
- patchelf --set-rpath '$ORIGIN' $file || die
- fi
- done
- fi
-
- patchelf --set-rpath '$ORIGIN' "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die
-
- sed -i \
- -e "\$a\\\\" \
- -e "\$a#-----------------------------------------------------------------------" \
- -e "\$a# Disable automatic updates as these are handled through Gentoo's" \
- -e "\$a# package manager. See bug #704494" \
- -e "\$a#-----------------------------------------------------------------------" \
- -e "\$aide.no.platform.update=Gentoo" bin/idea.properties
-
- eapply_user
-}
-
-src_install() {
- local dir="/opt/${PN}-${MY_PV}"
-
- insinto "${dir}"
- doins -r *
- fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
- if use amd64; then
- JRE_DIR=jre64
- else
- JRE_DIR=jre
- fi
- if use jbr8 || use jbr11 ; then
- if use jbr8; then
- JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
- else
- JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
- fi
- if [[ -d ${JRE_DIR} ]]; then
- for jrebin in $JRE_BINARIES; do
- fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
- done
- fi
- fi
-
- make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
- newicon "bin/${MY_PN}.png" "${PN}.png"
- make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/" || die
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/idea-community/idea-community-2020.1.3.201.8538.31.ebuild b/dev-util/idea-community/idea-community-2020.1.3.201.8538.31.ebuild
new file mode 100644
index 000000000000..7c374ac31a95
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2020.1.3.201.8538.31.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-3)"
+MY_PN="idea"
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
+# available separately
+JRE11_BASE="11_0_2"
+JRE11_VER="164"
+JRE_BASE="8u202"
+JRE_VER="1483.37"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+ # upstream EAP
+ KEYWORDS=""
+ SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+ # upstream stable
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+ jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
+ amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
+ jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+ codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 )
+ jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC
+ JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+ MPL-1.0 MPL-1.1 OFL ZLIB"
+
+#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
+#either (or neither) bundled
+#Defaulting to jbr8 to match upstream
+IUSE="+jbr8 -jbr11"
+REQUIRED_USE="jbr8? ( !jbr11 )"
+
+DEPEND="!dev-util/${PN}:14
+ !dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+ >=virtual/jdk-1.7:*
+ dev-java/jansi-native
+ dev-libs/libdbusmenu
+ =dev-util/lldb-9*"
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+# jbr11 binary doesn't unpack nicely into a single folder
+src_unpack() {
+ default_src_unpack
+ if use jbr11 ; then
+ mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+ fi
+}
+
+src_prepare() {
+ if use amd64; then
+ JRE_DIR=jre64
+ else
+ JRE_DIR=jre
+ fi
+
+ if use jbr8; then
+ mv "${WORKDIR}/jre" ./"${JRE_DIR}"
+ PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
+ else
+ PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+ fi
+
+ rm -vf ${PLUGIN_DIR}/libavplugin*
+ rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+ rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+ rm -vf "${S}"/bin/libdbm64*
+
+ if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+ for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+ do
+ if [[ -f "$file" ]]; then
+ patchelf --set-rpath '$ORIGIN' $file || die
+ fi
+ done
+ fi
+
+ patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+
+ sed -i \
+ -e "\$a\\\\" \
+ -e "\$a#-----------------------------------------------------------------------" \
+ -e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+ -e "\$a# package manager. See bug #704494" \
+ -e "\$a#-----------------------------------------------------------------------" \
+ -e "\$aide.no.platform.update=Gentoo" bin/idea.properties
+
+ eapply_user
+}
+
+src_install() {
+ local dir="/opt/${PN}-${MY_PV}"
+
+ insinto "${dir}"
+ doins -r *
+ fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+ if use amd64; then
+ JRE_DIR=jre64
+ else
+ JRE_DIR=jre
+ fi
+ if use jbr8 || use jbr11 ; then
+ if use jbr8; then
+ JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
+ else
+ JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+ fi
+ if [[ -d ${JRE_DIR} ]]; then
+ for jrebin in $JRE_BINARIES; do
+ fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+ done
+ fi
+ fi
+
+ make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+ newicon "bin/${MY_PN}.png" "${PN}.png"
+ make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
+
+ # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+ mkdir -p "${D}/etc/sysctl.d/" || die
+ echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index cfc23dee750f..94291a5934b1 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -3,11 +3,15 @@ DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c894
DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
+DIST llvmorg-10.0.1-rc3.tar.gz 120876192 BLAKE2B c48c7e00b37adaab411a34196b87eb630a997ce56bcc33350a698d6d8e24877844b037735ec44abf80ac4c0a4d5a8682745afce4c44cb806bbe9e2a74d875da1 SHA512 ccb6a5bff336924381def11cdfa9c676351461e293b6250b15c1c6cd7694b99beb3e2f3834e8321a28586da091492cbde689213eb4108c9dbe86724e1ee66949
+DIST llvmorg-10.0.1-rc4.tar.gz 120873659 BLAKE2B 2413fb8af98384e608fab83b91fa826ffe2a7cdeb052eb6a50f253f9fe46ee71c040f210bb2f395d73b0a2772854ccafe2ac2cf1cc7c8405bc988183fa732aea SHA512 8b3f0b794c98956238e5d3d195e3a9cb9c9a40f78e2ed72c767fbeac3e1dbae58cb8132db7d2c8caa891a4d0bf631e2a9afc67f3c37707e9e6b94e2f9aeb77b8
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
EBUILD lldb-10.0.0.ebuild 2479 BLAKE2B cb39d007fbec1c1c024f32c196bd0a1602256aa76f8e2983bfb7832681d28d330b6dcbe66591691d8bfbe0f508abb1d6f24325c8a2b3b680286b05ead4c3df96 SHA512 c07203f7769da2847114176bfa2fd1b816dd68177586ab759d38ae024fbc0454b1a3b9b05e6781988c201814ab49cca314a44f5acd4dd6c7210b36371354ff19
EBUILD lldb-10.0.1.9999.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
EBUILD lldb-10.0.1_rc1.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
EBUILD lldb-10.0.1_rc2.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
+EBUILD lldb-10.0.1_rc3.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
+EBUILD lldb-10.0.1_rc4.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
EBUILD lldb-11.0.0.9999.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
EBUILD lldb-8.0.1-r1.ebuild 3161 BLAKE2B 02f7f7c7461fed05baa15f6621ed8c32f669182395356a30e407582e74a63cf99b0d3b9c03031a976ea0b7734d3c61c64019b463ef68f315ae936ce679ceec77 SHA512 0a28c0147d2c37dc13dec96401f2d6e670db601735343c9befef24bf9626476a0effe715161703e4250066128c78b97b3f5e1ba5d6e67392b6cdacc0dd42dbfe
EBUILD lldb-9.0.1-r1.ebuild 2391 BLAKE2B c0e73cf6e7c6fc153855681daa373618baffa2d45bd290855633d957464e99d86112918eec8aa0b43a975750e8ccd87fbffe2594b0110ac406eab8579c654f72 SHA512 8edadff2f01c15b75d894e30546a00826f140a81bc0ebfb5fb214eb5d133d8390b18a3075746fe94f061b36fcea9fb981ecd6de3d0567f73736c388af62c6320
diff --git a/dev-util/lldb/lldb-10.0.1_rc3.ebuild b/dev-util/lldb/lldb-10.0.1_rc3.ebuild
new file mode 100644
index 000000000000..2dfe01834ca3
--- /dev/null
+++ b/dev-util/lldb/lldb-10.0.1_rc3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ libedit? ( dev-libs/libedit:0= )
+ lzma? ( app-arch/xz-utils:= )
+ ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/six[${PYTHON_MULTI_USEDEP}]
+ ')
+ ${PYTHON_DEPS}
+ )
+ ~sys-devel/clang-${PV}[xml]
+ ~sys-devel/llvm-${PV}
+ ! just get rid of it
+ echo "version=\"${PV}\"" > "${S}"/stgit/builtin_version.py
+
+ distutils-r1_python_prepare_all
+}
+
+src_compile() {
+ distutils-r1_src_compile
+
+ # bug 526468
+ if use doc; then
+ emake DESTDIR="${D}" \
+ htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
+ mandir="${EPREFIX}/usr/share/man/" \
+ doc
+ fi
+}
+
+src_install() {
+ if use doc; then
+ emake DESTDIR="${D}" \
+ htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
+ mandir="${EPREFIX}/usr/share/man/" \
+ install-doc install-html
+ fi
+
+ distutils-r1_src_install
+
+ newbashcomp completion/stgit.bash 'stg'
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index ace062d0db0e..b8ce31a48689 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/php-ext-source-r2.eclass b/eclass/php-ext-source-r2.eclass
deleted file mode 100644
index a3658cce461d..000000000000
--- a/eclass/php-ext-source-r2.eclass
+++ /dev/null
@@ -1,379 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# @ECLASS: php-ext-source-r2.eclass
-# @MAINTAINER:
-# Gentoo PHP team
-# @AUTHOR:
-# Author: Tal Peer
-# Author: Stuart Herbert
-# Author: Luca Longinotti
-# Author: Jakub Moc (documentation)
-# Author: Ole Markus With
-# @SUPPORTED_EAPIS: 4 5
-# @BLURB: A unified interface for compiling and installing standalone PHP extensions.
-# @DESCRIPTION:
-# This eclass provides a unified interface for compiling and installing standalone
-# PHP extensions (modules).
-
-inherit autotools multilib
-
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
-
-DEPEND=">=sys-devel/m4-1.4.3
- >=sys-devel/libtool-1.5.18"
-RDEPEND=""
-
-# Because of USE deps, we require at least EAPI 2
-case ${EAPI} in
- 4|5) ;;
- *)
- die "php-ext-source-r2 is not compatible with EAPI=${EAPI}"
-esac
-
-# @ECLASS-VARIABLE: PHP_EXT_NAME
-# @REQUIRED
-# @DESCRIPTION:
-# The extension name. This must be set, otherwise the eclass dies.
-# Only automagically set by php-ext-pecl-r2.eclass, so unless your ebuild
-# inherits that eclass, you must set this manually before inherit.
-[[ -z "${PHP_EXT_NAME}" ]] && die "No module name specified for the php-ext-source-r2 eclass"
-
-# @ECLASS-VARIABLE: PHP_EXT_INI
-# @DESCRIPTION:
-# Controls whether or not to add a line to php.ini for the extension.
-# Defaults to "yes" and should not be changed in most cases.
-[[ -z "${PHP_EXT_INI}" ]] && PHP_EXT_INI="yes"
-
-# @ECLASS-VARIABLE: PHP_EXT_ZENDEXT
-# @DESCRIPTION:
-# Controls whether the extension is a ZendEngine extension or not.
-# Defaults to "no" and if you don't know what is it, you don't need it.
-[[ -z "${PHP_EXT_ZENDEXT}" ]] && PHP_EXT_ZENDEXT="no"
-
-# @ECLASS-VARIABLE: USE_PHP
-# @REQUIRED
-# @DESCRIPTION:
-# Lists the PHP slots compatibile the extension is compatibile with
-# Example:
-# @CODE
-# USE_PHP="php5-5 php5-6"
-# @CODE
-[[ -z "${USE_PHP}" ]] && die "USE_PHP is not set for the php-ext-source-r2 eclass"
-
-# @ECLASS-VARIABLE: PHP_EXT_OPTIONAL_USE
-# @DESCRIPTION:
-# If set, this is the USE flag that the PHP dependencies are behind
-# Most commonly set as PHP_EXT_OPTIONAL_USE=php to get the dependencies behind
-# USE=php.
-
-# @ECLASS-VARIABLE: PHP_EXT_S
-# @DESCRIPTION:
-# The relative location of the temporary build directory for the PHP extension within
-# the source package. This is useful for packages that bundle the PHP extension.
-# Defaults to ${S}
-[[ -z "${PHP_EXT_S}" ]] && PHP_EXT_S="${S}"
-
-#Make sure at least one target is installed.
-REQUIRED_USE="${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }|| ( "
-for target in ${USE_PHP}; do
- IUSE="${IUSE} php_targets_${target}"
- target=${target/+}
- REQUIRED_USE+="php_targets_${target} "
- slot=${target/php}
- slot=${slot/-/.}
- PHPDEPEND="${PHPDEPEND}
- php_targets_${target}? ( dev-lang/php:${slot} )"
-done
-REQUIRED_USE+=") ${PHP_EXT_OPTIONAL_USE:+ )}"
-
-RDEPEND="${RDEPEND}
- ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
- ${PHPDEPEND}
- ${PHP_EXT_OPTIONAL_USE:+ )}"
-
-DEPEND="${DEPEND}
- ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
- ${PHPDEPEND}
- ${PHP_EXT_OPTIONAL_USE:+ )}
-"
-
-# @FUNCTION: php-ext-source-r2_src_unpack
-# @DESCRIPTION:
-# runs standard src_unpack + _phpize
-
-# @ECLASS-VARIABLE: PHP_EXT_SKIP_PHPIZE
-# @DESCRIPTION:
-# phpize will be run by default for all ebuilds that use
-# php-ext-source-r2_src_unpack
-# Set PHP_EXT_SKIP_PHPIZE="yes" in your ebuild if you do not want to run phpize.
-
-php-ext-source-r2_src_unpack() {
- unpack ${A}
- local slot orig_s="${PHP_EXT_S}"
- for slot in $(php_get_slots); do
- cp -r "${orig_s}" "${WORKDIR}/${slot}" || die "Failed to copy source ${orig_s} to PHP target directory"
- done
-}
-
-php-ext-source-r2_src_prepare() {
- local slot orig_s="${PHP_EXT_S}"
- for slot in $(php_get_slots); do
- php_init_slot_env ${slot}
- php-ext-source-r2_phpize
- done
-}
-
-# @FUNCTION: php-ext-source-r2_phpize
-# @DESCRIPTION:
-# Runs phpize and autotools in addition to the standard src_unpack
-php-ext-source-r2_phpize() {
- if [[ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]] ; then
- # Create configure out of config.m4. We use autotools_run_tool
- # to avoid some warnings about WANT_AUTOCONF and
- # WANT_AUTOMAKE (see bugs #329071 and #549268).
- autotools_run_tool ${PHPIZE}
- # force run of libtoolize and regeneration of related autotools
- # files (bug 220519)
- rm aclocal.m4
- eautoreconf
- fi
-}
-
-# @FUNCTION: php-ext-source-r2_src_configure
-# @DESCRIPTION:
-# Takes care of standard configure for PHP extensions (modules).
-
-# @ECLASS-VARIABLE: my_conf
-# @DESCRIPTION:
-# Set this in the ebuild to pass configure options to econf.
-
-php-ext-source-r2_src_configure() {
- # net-snmp creates this file #385403
- addpredict /usr/share/snmp/mibs/.index
- addpredict /var/lib/net-snmp/mib_indexes
-
- local slot
- for slot in $(php_get_slots); do
- php_init_slot_env ${slot}
- # Set the correct config options
- econf --with-php-config=${PHPCONFIG} ${my_conf} || die "Unable to configure code to compile"
- done
-}
-
-# @FUNCTION: php-ext-source-r2_src_compile
-# @DESCRIPTION:
-# Takes care of standard compile for PHP extensions (modules).
-php-ext-source-r2_src_compile() {
- # net-snmp creates this file #324739
- addpredict /usr/share/snmp/mibs/.index
- addpredict /var/lib/net-snmp/mib_indexes
-
- # shm extension createss a semaphore file #173574
- addpredict /session_mm_cli0.sem
- local slot
- for slot in $(php_get_slots); do
- php_init_slot_env ${slot}
- emake || die "Unable to make code"
-
- done
-}
-
-# @FUNCTION: php-ext-source-r2_src_install
-# @DESCRIPTION:
-# Takes care of standard install for PHP extensions (modules).
-
-# @ECLASS-VARIABLE: DOCS
-# @DESCRIPTION:
-# Set in ebuild if you wish to install additional, package-specific documentation.
-php-ext-source-r2_src_install() {
- local slot
- for slot in $(php_get_slots); do
- php_init_slot_env ${slot}
-
- # Let's put the default module away. Strip $EPREFIX from
- # $EXT_DIR before calling newins (which handles EPREFIX itself).
- insinto "${EXT_DIR#$EPREFIX}"
- newins "modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
-
- local doc
- for doc in ${DOCS} ; do
- [[ -s ${doc} ]] && dodoc ${doc}
- done
-
- INSTALL_ROOT="${D}" emake install-headers
- done
- php-ext-source-r2_createinifiles
-}
-
-
-php_get_slots() {
- local s slot
- for slot in ${USE_PHP}; do
- use php_targets_${slot} && s+=" ${slot/-/.}"
- done
- echo $s
-}
-
-php_init_slot_env() {
- libdir=$(get_libdir)
-
- PHPIZE="${EPREFIX}/usr/${libdir}/${1}/bin/phpize"
- PHPCONFIG="${EPREFIX}/usr/${libdir}/${1}/bin/php-config"
- PHPCLI="${EPREFIX}/usr/${libdir}/${1}/bin/php"
- PHPCGI="${EPREFIX}/usr/${libdir}/${1}/bin/php-cgi"
- PHP_PKG="$(best_version =dev-lang/php-${1:3}*)"
- PHPPREFIX="${EPREFIX}/usr/${libdir}/${slot}"
- EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"
- PHP_CURRENTSLOT=${1:3}
-
- PHP_EXT_S="${WORKDIR}/${1}"
- cd "${PHP_EXT_S}"
-}
-
-php-ext-source-r2_buildinilist() {
- # Work out the list of .ini files to edit/add to
- if [[ -z "${PHPSAPILIST}" ]] ; then
- PHPSAPILIST="apache2 cli cgi fpm embed phpdbg"
- fi
-
- PHPINIFILELIST=""
- local x
- for x in ${PHPSAPILIST} ; do
- if [[ -f "${EPREFIX}/etc/php/${x}-${1}/php.ini" ]] ; then
- PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-${1}/ext/${PHP_EXT_NAME}.ini"
- fi
- done
- PHPFULLINIFILELIST="${PHPFULLINIFILELIST} ${PHPINIFILELIST}"
-}
-
-# @FUNCTION: php-ext-source-r2_createinifiles
-# @DESCRIPTION:
-# Builds ini files for every enabled slot and SAPI
-php-ext-source-r2_createinifiles() {
- local slot
- for slot in $(php_get_slots); do
- php_init_slot_env ${slot}
- # Pull in the PHP settings
-
- # Build the list of .ini files to edit/add to
- php-ext-source-r2_buildinilist ${slot}
-
-
- # Add the needed lines to the .ini files
- local file
- if [[ "${PHP_EXT_INI}" = "yes" ]] ; then
- for file in ${PHPINIFILELIST}; do
- php-ext-source-r2_addextension "${PHP_EXT_NAME}.so" "${file}"
- done
- fi
-
- # Symlink the .ini files from ext/ to ext-active/
- local inifile
- for inifile in ${PHPINIFILELIST} ; do
- if [[ -n "${PHP_EXT_INIFILE}" ]]; then
- cat "${FILESDIR}/${PHP_EXT_INIFILE}" >> "${ED}/${inifile}"
- einfo "Added content of ${FILESDIR}/${PHP_EXT_INIFILE} to ${inifile}"
- fi
- inidir="${inifile/${PHP_EXT_NAME}.ini/}"
- inidir="${inidir/ext/ext-active}"
- dodir "/${inidir}"
- dosym "/${inifile}" "/${inifile/ext/ext-active}"
- done
-
- # Add support for installing PHP files into a version dependant directory
- PHP_EXT_SHARED_DIR="${EPREFIX}/usr/share/php/${PHP_EXT_NAME}"
- done
-}
-
-php-ext-source-r2_addextension() {
- if [[ "${PHP_EXT_ZENDEXT}" = "yes" ]] ; then
- # We need the full path for ZendEngine extensions
- # and we need to check for debugging enabled!
- if has_version "dev-lang/php:${PHP_CURRENTSLOT}[threads]" ; then
- if has_version "dev-lang/php:${PHP_CURRENTSLOT}[debug]" ; then
- ext_type="zend_extension_debug_ts"
- else
- ext_type="zend_extension_ts"
- fi
- ext_file="${EXT_DIR}/${1}"
- else
- if has_version "dev-lang/php:${PHP_CURRENTSLOT}[debug]"; then
- ext_type="zend_extension_debug"
- else
- ext_type="zend_extension"
- fi
- ext_file="${EXT_DIR}/${1}"
- fi
-
- # php-5.3 unifies zend_extension loading and just requires the
- # zend_extension keyword with no suffix
- # TODO: drop previous code and this check once =dev-lang/php-5.3' ; then
- ext_type="zend_extension"
- fi
- else
- # We don't need the full path for normal extensions!
- ext_type="extension"
- ext_file="${1}"
- fi
-
- php-ext-source-r2_addtoinifile "${ext_type}" "${ext_file}" "${2}" "Extension added"
-}
-
-# $1 - Setting name
-# $2 - Setting value
-# $3 - File to add to
-# $4 - Sanitized text to output
-php-ext-source-r2_addtoinifile() {
- local inifile="${WORKDIR}/${3}"
- if [[ ! -d $(dirname ${inifile}) ]] ; then
- mkdir -p $(dirname ${inifile})
- fi
-
- # Are we adding the name of a section?
- if [[ ${1:0:1} == "[" ]] ; then
- echo "${1}" >> "${inifile}"
- my_added="${1}"
- else
- echo "${1}=${2}" >> "${inifile}"
- my_added="${1}=${2}"
- fi
-
- if [[ -z "${4}" ]] ; then
- einfo "Added '${my_added}' to /${3}"
- else
- einfo "${4} to /${3}"
- fi
-
- insinto /$(dirname ${3})
- doins "${inifile}"
-}
-
-# @FUNCTION: php-ext-source-r2_addtoinifiles
-# @USAGE: [message to output]; or just [section name]
-# @DESCRIPTION:
-# Add value settings to php.ini file installed by the extension (module).
-# You can also add a [section], see examples below.
-#
-# @CODE
-# Add some settings for the extension:
-#
-# php-ext-source-r2_addtoinifiles "zend_optimizer.optimization_level" "15"
-# php-ext-source-r2_addtoinifiles "zend_optimizer.enable_loader" "0"
-# php-ext-source-r2_addtoinifiles "zend_optimizer.disable_licensing" "0"
-#
-# Adding values to a section in php.ini file installed by the extension:
-#
-# php-ext-source-r2_addtoinifiles "[Debugger]"
-# php-ext-source-r2_addtoinifiles "debugger.enabled" "on"
-# php-ext-source-r2_addtoinifiles "debugger.profiler_enabled" "on"
-# @CODE
-php-ext-source-r2_addtoinifiles() {
- local x
- for x in ${PHPFULLINIFILELIST} ; do
- php-ext-source-r2_addtoinifile "${1}" "${2}" "${x}" "${3}"
- done
-}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 08645d8f24fa..09d1f461a6fc 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index e3036251259a..de5898184107 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -5,6 +5,6 @@ AUX dolphin-5.0-xgetbv.patch 1137 BLAKE2B d736d25127fae4c552c1e28b0c152037a2c0a1
DIST dolphin-5.0.tar.gz 38246344 BLAKE2B 540eb5d0d3f2250d0b562caaef113bcae66ea47c3b6c2884f5612f36f990592d2c83ad0348cb83d71f5329414580f6cbf07081bdef2661bd277ee2f7613dc661 SHA512 8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a
DIST dolphin-5.0_p20200705.tar.gz 41580877 BLAKE2B 78fce8cb10543857633d66789999b0ebb8f195e10652b9316f3346d5c84797dea96a31f509f86cb9470b4b9677ca58c4a865494121277cd0bc7dcc93932da9f4 SHA512 8b1aed8c98ff7205d7b1716aea3faad0bfa3d1ff3fe3a616431a421ae62592a57887e18295276b7a0fee52d19e641b72d5dc00e071cefea7fbe40adc9f3f01a1
EBUILD dolphin-5.0.ebuild 4596 BLAKE2B 81fe5abe2b7779f189346605b6b3900066c6463d0e89be39984ee3ce92046c0ae3fff747e19467b3a105826ab5f1955d89a4e611d56111a15b173e0c77f01bad SHA512 6bf62074ba5f228119d19e23cac7621b96d63191367e60900ca5c82ae7deb5329c3eeb1cf2b898ca38e14d307f4f91703dcde53b753e85c841610070b9f2f382
-EBUILD dolphin-5.0_p20200705.ebuild 4445 BLAKE2B f57a626246d937829ca4d1d474eff29485510fbc21ee5e1c6a73e745270991db731cf4336f6dd2eaece07c3536c5aee632c5477fe52826887d90d50a1c320584 SHA512 30772463bc6b709dc090984539dbc102dc358702c16d8aad541b7b8664abbba0f3b9ad4e42b116511c061331181ae5d53796f07646fe00408eb582deab3ac118
-EBUILD dolphin-9999.ebuild 4445 BLAKE2B f57a626246d937829ca4d1d474eff29485510fbc21ee5e1c6a73e745270991db731cf4336f6dd2eaece07c3536c5aee632c5477fe52826887d90d50a1c320584 SHA512 30772463bc6b709dc090984539dbc102dc358702c16d8aad541b7b8664abbba0f3b9ad4e42b116511c061331181ae5d53796f07646fe00408eb582deab3ac118
+EBUILD dolphin-5.0_p20200705.ebuild 4421 BLAKE2B e147a08b0c7f9a1a8c8de714d4a0ecd8d325e5280efd000bf756007ccf999e039dd1190adb73a5a9248329f97b144150b0378723da53fb49fae9f7ca61de24cb SHA512 80ff62160b4d7740fc852e37728147029b898a02f305ef759239e9e6b012b409c9d756904bed2ef712b89193b25887366c8af243d22323d32f26d0df16216ca9
+EBUILD dolphin-9999.ebuild 4421 BLAKE2B e147a08b0c7f9a1a8c8de714d4a0ecd8d325e5280efd000bf756007ccf999e039dd1190adb73a5a9248329f97b144150b0378723da53fb49fae9f7ca61de24cb SHA512 80ff62160b4d7740fc852e37728147029b898a02f305ef759239e9e6b012b409c9d756904bed2ef712b89193b25887366c8af243d22323d32f26d0df16216ca9
MISC metadata.xml 825 BLAKE2B 47bce78aa687f194ff5fb0252f3cdaf76336ab5460cdf72ddaa2913f36dd69aa916cbfc7684ae276248e14d092d8107ab67c7d8c37b71bfca15778b171d725f2 SHA512 33a3c378f2ed7fd25a155b29a03dd3b87730e9c910e7b2d35148a7f6eafbb75e96eab0a0f9608a9ae34e1aa2ccb5d6cc849d895cd28912c88193640a8ac5a6b5
diff --git a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
index 2c2a6b61d4a0..56655d4613a0 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
@@ -61,9 +61,8 @@ RDEPEND="
systemd? ( sys-apps/systemd:0= )
upnp? ( net-libs/miniupnpc )
"
-DEPEND="${RDEPEND}
- app-arch/zip
- media-libs/freetype
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-devel/gettext
virtual/pkgconfig"
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index 2c2a6b61d4a0..56655d4613a0 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -61,9 +61,8 @@ RDEPEND="
systemd? ( sys-apps/systemd:0= )
upnp? ( net-libs/miniupnpc )
"
-DEPEND="${RDEPEND}
- app-arch/zip
- media-libs/freetype
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-devel/gettext
virtual/pkgconfig"
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 3704e9f37f3f..c58cbfdf8f8b 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 19e73e8f5e44..920511e78bec 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1,6 +1,15 @@
AUX openmw-0.45.0-osg-3.6.5-1.patch 2715 BLAKE2B 9b08b8cad0afd58170389f97cfca232330dcf14fa80d40a4dce4f0f9c770e3262b4206ff555d341e937c6c54b40c60030612b8478dddad97149a90b2431cc8f0 SHA512 95abc6fe8f2e9619c240b859e607e2119e7407e3d2688d78e98167007a4b1d9696d5198f6ba4644a8646a0435ae76611d315f07cd11f00165db71f3c9d18897b
AUX openmw-0.45.0-osg-3.6.5-2.patch 642 BLAKE2B 4ece0c64eefdbd249de648fc3c85087f392bddb073033872b26a85dbfc044a7b7b11097bc5a322d3a8b074ccde75ee507f7254c9bed2386480f2962acad505e4 SHA512 a5e5e11ffdeb96f921edf2dc3e787ed5be21ae816330841da263518df29c58a7231980194519db426e3ac45602320f108b4de9e262d643c58c23652beb4dde9d
+AUX openmw-0.46.0-fix-cast.patch 12792 BLAKE2B 583ca033350e16116de85ba3bfc121bc2a444686a4e7c75388880835e708e0860c787ee6504b6f907b6749afd23acaea87b84aeece5553a2e61562142d223257 SHA512 7784c327cb442e20afb0409f0f5ef2791fa9dbe3c15b6a8e60baabec7a1179778577ac60e5c14e9e83868c15db1aaffa145006ce4d0140f0db4869c6eb0f8b9a
+AUX openmw-0.46.0-floattest2.patch 8586 BLAKE2B b419473aa1f00b327654b0f3862819f296d8390ce9a290ebd98fcf39175d85045ad85bf1ca9521a6f033f836a7331e1511e3005f2ac2f15b43c45b22641d281f SHA512 286e9fa560f62f5a291c622a7939c57e8c674ba1a4762c6a20a8fefe0b91092ffd7a1663dd70f4cc287833de0a8177329bb58e1e87b3cc9ed0d22a4a4cd71c9d
+AUX openmw-0.46.0-missing-include.patch 682 BLAKE2B fa80b94d9ce91e1b05b96c02e80f32f1e9066ba6f8ada4a1e5150cf3a278d3a233eda42269b3027c56aaa7be98dd33cbcc3932d1e0930a51bd6b5744a73d6b6e SHA512 d0d47fe249e8fb366e00e272dc62853f8a2aaa75d45d83d270891e76674c1382fd3405e674e3b6c383bbc17125c4471893e77251744deae4d17bc373d847a638
+AUX openmw-0.46.0-mygui-license.patch 742 BLAKE2B a36016cf4b29c31918376dd27082f42cdaeacd5e8fff5a2860b827ce3db6b7fd711b2c6b8453b3792d506ec31749fb457d11225c64ff792257e30c796013501b SHA512 43895daa22eaf5891d789abed22e6d9df3c6817a7060bee7407963dbd13413dcd8fce03f236b3d7e0d589d925e9cbfe5125c72b1b2735479bf56d122cad85383
+AUX openmw-0.46.0-nifbullet-test.patch 12675 BLAKE2B fadb3c75bd0fcf4f351f30c86cdc3b407f4f7e97c3c9c278f3e20197a5c78c5b9ff320c9a53bd04fd40114f3b851f9523dd390c75487832cee67b3de7ef228d6 SHA512 e63d5f1e3e3c03a94ff2e926b2ce54d611c12a29749eba8d3c20c4d1ba1ee437142e40b20c08d2da714d7e98d573f4b1e5eaa99425b6dd27aace0e1852bb0ccb
+AUX openmw-0.46.0-recastnavigation.patch 988 BLAKE2B 3d9dd71a02070268fe21006fda20f2617ad57ce11782c5d05d3deb0c51ae2e2c91f679b23da92b6b939479fe176e99d63705ab1a3bb9d20cc7c39ab55fff2ac3 SHA512 49591f413ff68fbb11b7742c44d138f234e69478eae3462a5a402ac626bf67283e18a05dd2e2cea33706cdeb54deaf28e8a788e91491ddfe0ce10ffd978fc4e0
DIST openmw-0.45.0.tar.gz 4711103 BLAKE2B 85676294b07170dd6845892e9e7b354c5767428584c76ea2e1a64e9f9c72c46c279fdf5043058d37b927cb55e6cf2e2222833129d64954cdcdb3af4eb4b84dc3 SHA512 b968426659457cf486f6756f7ab82cc4cb34a92923c433dd86f711e5d7097f75441ed17daa50d21f15f1847f5aed1f4c3a094a06cfd3f2e9b90aa182742c596f
+DIST openmw-0.46.0-floattest.patch 43168 BLAKE2B 060b529fd4cd01f0fc723bb5a00a256b9c1ae4413c7b22581467cce75416e01041c3af22f0215ad9b1c475965a988065e0860c01c1e71d97454b022eec4779ea SHA512 0e165417e9ae047231fdc27b62251b33867f3782c1753f81705c886d6d3a433c8bbc3b4653a2555bc644bad11db9769d4bc2abcc84ca3ab23fabb6b80347bc32
+DIST openmw-0.46.0.tar.gz 5155004 BLAKE2B 8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c SHA512 da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486
EBUILD openmw-0.45.0.ebuild 3181 BLAKE2B a307152c8ee882a2fffeb13cee467905421a31781d446eb6d87618f8c040b08bae35f924408aca7eb1e63fd5a88a8166255a25df2d8ac4ed9d36c28a6dd86f74 SHA512 7db0200339d854d1f0eac9fbbbb5457c647ef0a2ae4a7abf9a52707e722ae6643356f88293d114c034672e8c50c1d77ecf1391c5156e18061ba59168f97d0f66
-EBUILD openmw-9999.ebuild 3369 BLAKE2B 65fb37a972d19e2d47b2b7b7c7b1a6aa2a4f13e5383f32654c8aa7bad2450829e01c56e41310e574d62fd5b0d9d0cf0f1dcfb3ee4f6beeac5a20bd003ff5c36a SHA512 968d75c244e28a689ed8096330e453c88d57dfc6e40b7f9c0d6725978a4849c760ca4351a9485891b4bf419297c512369d28ad673eec285b1fcee0606060e260
-MISC metadata.xml 1278 BLAKE2B 5a79eef3251275f05d388d0236edd548baf111ce140cbfd6942851909039299f5bf6460d01b2a8c760c82c46a6b5880e0316c1cc0c4eda9a1599ce76b127c8ee SHA512 96b66a7c7f8cb4303b9853640e8e11f7be48bd7e5d644db9468ac0b43c1254e670f2e84a2117dbdd31c9709207c58d0ad523e3310287515bc11fa0e58de5c4ab
+EBUILD openmw-0.46.0.ebuild 4206 BLAKE2B 766941398d741237a34dfd714733fc8d8b93a501891aedef23ab617e2c8f076315c4c1b9149d0c64732f90d7da96986c91b1d6151602183d27468e20a210d968 SHA512 479a8c45a7de6a85c5cf207f1e42f5f6d0e5294a655de93259dca84c9afb6ab0b3f56c8a75da3988cea8b334df149f0ee1e044ec6e79f6cb4e335396d9441144
+EBUILD openmw-9999.ebuild 3823 BLAKE2B 3fe2536511500fd69a89f3909723699947342a36a64896d45bc9d36cc00caf14cce157b22f897dc7ebda658a45d519aa18e47ccb15b05d75ad413ff4bc826f95 SHA512 35a7f72621b971c003497442713a84ef56799d0f7d1ceb7940085d838a9622be31d1f9c44a7adfe581d8781a5f40095277ef43c84274c055fd12e391b9305c74
+MISC metadata.xml 1423 BLAKE2B 6d7f6b2805b52571b305668ff9120318c3f2d87719f8e51e644b555c62ea9aaa4afa0f3a23ff67c8a08e04cacf3bdb3d9f7295985f980c27b57b53aa7b55c5e2 SHA512 31e201da1c43b973a57cf51276022c7e39371210ec2eb505f362cad4e669b5aef1f503e2511473880f2313b91a8f1f128db425f9538f58b7fc52df24ec066feb
diff --git a/games-engines/openmw/files/openmw-0.46.0-fix-cast.patch b/games-engines/openmw/files/openmw-0.46.0-fix-cast.patch
new file mode 100644
index 000000000000..f6e82cb3a2c9
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.46.0-fix-cast.patch
@@ -0,0 +1,214 @@
+Fixes build on ~arch system, patch from upstream, to be dropped for 0.47
+
+From 208a50340db5506dded60c05272ce9692773baa9 Mon Sep 17 00:00:00 2001
+From: elsid
+Date: Mon, 13 Apr 2020 20:45:07 +0200
+Subject: [PATCH] Specialize DetourNavigator::ObjectId ctor for pointers
+
+To fix msvc error:
+components\detournavigator\objectid.hpp(14,13): error C2440: 'reinterpret_cast': cannot convert from 'const T' to 'size_t'
+ with
+ [
+ T=unsigned long
+ ]
+diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+index 5275d9119e..e44ae48786 100644
+--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
++++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+@@ -61,15 +61,15 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- EXPECT_TRUE(manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
++ EXPECT_TRUE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
+ }
+
+ TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_for_existing_object_should_return_false)
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+- EXPECT_FALSE(manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ EXPECT_FALSE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
+ }
+
+ TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, update_object_for_changed_object_should_return_changed_tiles)
+@@ -77,9 +77,9 @@ namespace
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+ const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
+- manager.addObject(ObjectId(1ul), boxShape, transform, AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, transform, AreaType::AreaType_ground);
+ EXPECT_THAT(
+- manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground),
++ manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground),
+ ElementsAre(TilePosition(-1, -1), TilePosition(-1, 0), TilePosition(0, -1), TilePosition(0, 0),
+ TilePosition(1, -1), TilePosition(1, 0))
+ );
+@@ -89,9 +89,9 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_EQ(
+- manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground),
++ manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground),
+ std::vector()
+ );
+ }
+@@ -100,7 +100,7 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
+@@ -111,7 +111,7 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_EQ(manager.getMesh(TilePosition(1, 0)), nullptr);
+ }
+
+@@ -121,13 +121,13 @@ namespace
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+ const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
+
+- manager.addObject(ObjectId(1ul), boxShape, transform, AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, transform, AreaType::AreaType_ground);
+ EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(0, 0)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(1, 0)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(1, -1)), nullptr);
+
+- manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
+@@ -140,11 +140,11 @@ namespace
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+ const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
+
+- manager.addObject(ObjectId(1ul), boxShape, transform, AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, transform, AreaType::AreaType_ground);
+ EXPECT_EQ(manager.getMesh(TilePosition(-1, -1)), nullptr);
+ EXPECT_EQ(manager.getMesh(TilePosition(-1, 0)), nullptr);
+
+- manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_EQ(manager.getMesh(TilePosition(1, 0)), nullptr);
+ EXPECT_EQ(manager.getMesh(TilePosition(1, -1)), nullptr);
+ }
+@@ -153,8 +153,8 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+- manager.removeObject(ObjectId(1ul));
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.removeObject(ObjectId(&boxShape));
+ EXPECT_EQ(manager.getMesh(TilePosition(-1, -1)), nullptr);
+ EXPECT_EQ(manager.getMesh(TilePosition(-1, 0)), nullptr);
+ EXPECT_EQ(manager.getMesh(TilePosition(0, -1)), nullptr);
+@@ -166,13 +166,13 @@ namespace
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(0, 0)), nullptr);
+
+- manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
+@@ -184,7 +184,7 @@ namespace
+ TileCachedRecastMeshManager manager(mSettings);
+ const auto initialRevision = manager.getRevision();
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_EQ(manager.getRevision(), initialRevision + 1);
+ }
+
+@@ -192,9 +192,9 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ const auto beforeAddRevision = manager.getRevision();
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_EQ(manager.getRevision(), beforeAddRevision);
+ }
+
+@@ -203,9 +203,9 @@ namespace
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+ const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
+- manager.addObject(ObjectId(1ul), boxShape, transform, AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, transform, AreaType::AreaType_ground);
+ const auto beforeUpdateRevision = manager.getRevision();
+- manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_EQ(manager.getRevision(), beforeUpdateRevision + 1);
+ }
+
+@@ -213,9 +213,9 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ const auto beforeUpdateRevision = manager.getRevision();
+- manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_EQ(manager.getRevision(), beforeUpdateRevision);
+ }
+
+@@ -223,9 +223,9 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ const auto beforeRemoveRevision = manager.getRevision();
+- manager.removeObject(ObjectId(1ul));
++ manager.removeObject(ObjectId(&boxShape));
+ EXPECT_EQ(manager.getRevision(), beforeRemoveRevision + 1);
+ }
+
+@@ -233,7 +233,7 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const auto beforeRemoveRevision = manager.getRevision();
+- manager.removeObject(ObjectId(1ul));
++ manager.removeObject(ObjectId(&manager));
+ EXPECT_EQ(manager.getRevision(), beforeRemoveRevision);
+ }
+ }
+diff --git a/components/detournavigator/objectid.hpp b/components/detournavigator/objectid.hpp
+index 3b56924b13..6ddcc9169d 100644
+--- a/components/detournavigator/objectid.hpp
++++ b/components/detournavigator/objectid.hpp
+@@ -10,7 +10,7 @@ namespace DetourNavigator
+ {
+ public:
+ template
+- explicit ObjectId(const T value) throw()
++ explicit ObjectId(T* value) throw()
+ : mValue(reinterpret_cast(value))
+ {
+ }
diff --git a/games-engines/openmw/files/openmw-0.46.0-floattest2.patch b/games-engines/openmw/files/openmw-0.46.0-floattest2.patch
new file mode 100644
index 000000000000..ca6e355eab7d
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.46.0-floattest2.patch
@@ -0,0 +1,139 @@
+https://gitlab.com/OpenMW/openmw/-/merge_requests/253
+
+--- a/apps/openmw_test_suite/detournavigator/navigator.cpp 2020-06-30 16:07:31.544410916 +0100
++++ b/apps/openmw_test_suite/detournavigator/navigator.cpp 2020-06-30 16:08:50.405698937 +0100
+@@ -458,25 +458,25 @@
+
+ EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim, mAreaCosts, mOut), Status::Success);
+
+- EXPECT_EQ(mPath, std::deque({
+- osg::Vec3f(0, 215, 185.33331298828125),
+- osg::Vec3f(0, 186.6666717529296875, 185.33331298828125),
+- osg::Vec3f(0, 158.333343505859375, 185.33331298828125),
+- osg::Vec3f(0, 130.0000152587890625, 185.33331298828125),
+- osg::Vec3f(0, 101.66667938232421875, 185.33331298828125),
+- osg::Vec3f(0, 73.333343505859375, 185.33331298828125),
+- osg::Vec3f(0, 45.0000152587890625, 185.33331298828125),
+- osg::Vec3f(0, 16.6666812896728515625, 185.33331298828125),
+- osg::Vec3f(0, -11.66664981842041015625, 185.33331298828125),
+- osg::Vec3f(0, -39.999980926513671875, 185.33331298828125),
+- osg::Vec3f(0, -68.33331298828125, 185.33331298828125),
+- osg::Vec3f(0, -96.66664886474609375, 185.33331298828125),
+- osg::Vec3f(0, -124.99997711181640625, 185.33331298828125),
+- osg::Vec3f(0, -153.33331298828125, 185.33331298828125),
+- osg::Vec3f(0, -181.6666412353515625, 185.33331298828125),
+- osg::Vec3f(0, -209.999969482421875, 185.33331298828125),
+- osg::Vec3f(0, -215, 185.33331298828125),
+- })) << mPath;
++ EXPECT_THAT(mPath, ElementsAre(
++ Vec3fEq(0, 215, 185.33331298828125),
++ Vec3fEq(0, 186.6666717529296875, 185.33331298828125),
++ Vec3fEq(0, 158.333343505859375, 185.33331298828125),
++ Vec3fEq(0, 130.0000152587890625, 185.33331298828125),
++ Vec3fEq(0, 101.66667938232421875, 185.33331298828125),
++ Vec3fEq(0, 73.333343505859375, 185.33331298828125),
++ Vec3fEq(0, 45.0000152587890625, 185.33331298828125),
++ Vec3fEq(0, 16.6666812896728515625, 185.33331298828125),
++ Vec3fEq(0, -11.66664981842041015625, 185.33331298828125),
++ Vec3fEq(0, -39.999980926513671875, 185.33331298828125),
++ Vec3fEq(0, -68.33331298828125, 185.33331298828125),
++ Vec3fEq(0, -96.66664886474609375, 185.33331298828125),
++ Vec3fEq(0, -124.99997711181640625, 185.33331298828125),
++ Vec3fEq(0, -153.33331298828125, 185.33331298828125),
++ Vec3fEq(0, -181.6666412353515625, 185.33331298828125),
++ Vec3fEq(0, -209.999969482421875, 185.33331298828125),
++ Vec3fEq(0, -215, 185.33331298828125)
++ ));
+ }
+
+ TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_water_when_ground_cross_water_with_swim_and_walk_flags)
+@@ -505,25 +505,25 @@
+ EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mOut),
+ Status::Success);
+
+- EXPECT_EQ(mPath, std::deque({
+- osg::Vec3f(0, 215, -94.75363922119140625),
+- osg::Vec3f(0, 186.6666717529296875, -106.0000152587890625),
+- osg::Vec3f(0, 158.333343505859375, -115.85507965087890625),
+- osg::Vec3f(0, 130.0000152587890625, -125.71016693115234375),
+- osg::Vec3f(0, 101.66667938232421875, -135.5652313232421875),
+- osg::Vec3f(0, 73.333343505859375, -143.3333587646484375),
+- osg::Vec3f(0, 45.0000152587890625, -143.3333587646484375),
+- osg::Vec3f(0, 16.6666812896728515625, -143.3333587646484375),
+- osg::Vec3f(0, -11.66664981842041015625, -143.3333587646484375),
+- osg::Vec3f(0, -39.999980926513671875, -143.3333587646484375),
+- osg::Vec3f(0, -68.33331298828125, -143.3333587646484375),
+- osg::Vec3f(0, -96.66664886474609375, -137.3043670654296875),
+- osg::Vec3f(0, -124.99997711181640625, -127.44930267333984375),
+- osg::Vec3f(0, -153.33331298828125, -117.59423065185546875),
+- osg::Vec3f(0, -181.6666412353515625, -107.73915863037109375),
+- osg::Vec3f(0, -209.999969482421875, -97.7971343994140625),
+- osg::Vec3f(0, -215, -94.75363922119140625),
+- })) << mPath;
++ EXPECT_THAT(mPath, ElementsAre(
++ Vec3fEq(0, 215, -94.75363922119140625),
++ Vec3fEq(0, 186.6666717529296875, -106.0000152587890625),
++ Vec3fEq(0, 158.333343505859375, -115.85507965087890625),
++ Vec3fEq(0, 130.0000152587890625, -125.71016693115234375),
++ Vec3fEq(0, 101.66667938232421875, -135.5652313232421875),
++ Vec3fEq(0, 73.333343505859375, -143.3333587646484375),
++ Vec3fEq(0, 45.0000152587890625, -143.3333587646484375),
++ Vec3fEq(0, 16.6666812896728515625, -143.3333587646484375),
++ Vec3fEq(0, -11.66664981842041015625, -143.3333587646484375),
++ Vec3fEq(0, -39.999980926513671875, -143.3333587646484375),
++ Vec3fEq(0, -68.33331298828125, -143.3333587646484375),
++ Vec3fEq(0, -96.66664886474609375, -137.3043670654296875),
++ Vec3fEq(0, -124.99997711181640625, -127.44930267333984375),
++ Vec3fEq(0, -153.33331298828125, -117.59423065185546875),
++ Vec3fEq(0, -181.6666412353515625, -107.73915863037109375),
++ Vec3fEq(0, -209.999969482421875, -97.7971343994140625),
++ Vec3fEq(0, -215, -94.75363922119140625)
++ ));
+ }
+
+ TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_water_when_ground_cross_water_with_max_int_cells_size_and_swim_and_walk_flags)
+@@ -552,25 +552,25 @@
+ EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mOut),
+ Status::Success);
+
+- EXPECT_EQ(mPath, std::deque({
+- osg::Vec3f(0, 215, -94.75363922119140625),
+- osg::Vec3f(0, 186.6666717529296875, -106.0000152587890625),
+- osg::Vec3f(0, 158.333343505859375, -115.85507965087890625),
+- osg::Vec3f(0, 130.0000152587890625, -125.71016693115234375),
+- osg::Vec3f(0, 101.66667938232421875, -135.5652313232421875),
+- osg::Vec3f(0, 73.333343505859375, -143.3333587646484375),
+- osg::Vec3f(0, 45.0000152587890625, -143.3333587646484375),
+- osg::Vec3f(0, 16.6666812896728515625, -143.3333587646484375),
+- osg::Vec3f(0, -11.66664981842041015625, -143.3333587646484375),
+- osg::Vec3f(0, -39.999980926513671875, -143.3333587646484375),
+- osg::Vec3f(0, -68.33331298828125, -143.3333587646484375),
+- osg::Vec3f(0, -96.66664886474609375, -137.3043670654296875),
+- osg::Vec3f(0, -124.99997711181640625, -127.44930267333984375),
+- osg::Vec3f(0, -153.33331298828125, -117.59423065185546875),
+- osg::Vec3f(0, -181.6666412353515625, -107.73915863037109375),
+- osg::Vec3f(0, -209.999969482421875, -97.7971343994140625),
+- osg::Vec3f(0, -215, -94.75363922119140625),
+- })) << mPath;
++ EXPECT_THAT(mPath, ElementsAre(
++ Vec3fEq(0, 215, -94.75363922119140625),
++ Vec3fEq(0, 186.6666717529296875, -106.0000152587890625),
++ Vec3fEq(0, 158.333343505859375, -115.85507965087890625),
++ Vec3fEq(0, 130.0000152587890625, -125.71016693115234375),
++ Vec3fEq(0, 101.66667938232421875, -135.5652313232421875),
++ Vec3fEq(0, 73.333343505859375, -143.3333587646484375),
++ Vec3fEq(0, 45.0000152587890625, -143.3333587646484375),
++ Vec3fEq(0, 16.6666812896728515625, -143.3333587646484375),
++ Vec3fEq(0, -11.66664981842041015625, -143.3333587646484375),
++ Vec3fEq(0, -39.999980926513671875, -143.3333587646484375),
++ Vec3fEq(0, -68.33331298828125, -143.3333587646484375),
++ Vec3fEq(0, -96.66664886474609375, -137.3043670654296875),
++ Vec3fEq(0, -124.99997711181640625, -127.44930267333984375),
++ Vec3fEq(0, -153.33331298828125, -117.59423065185546875),
++ Vec3fEq(0, -181.6666412353515625, -107.73915863037109375),
++ Vec3fEq(0, -209.999969482421875, -97.7971343994140625),
++ Vec3fEq(0, -215, -94.75363922119140625)
++ ));
+ }
+
+ TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_ground_when_ground_cross_water_with_only_walk_flag)
diff --git a/games-engines/openmw/files/openmw-0.46.0-missing-include.patch b/games-engines/openmw/files/openmw-0.46.0-missing-include.patch
new file mode 100644
index 000000000000..803707498e43
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.46.0-missing-include.patch
@@ -0,0 +1,19 @@
+Fixes build on ~arch system, patch from upstream, to be dropped for 0.47
+
+From 10daadefbea1f62a818c339dc7f3d69a858bc8a6 Mon Sep 17 00:00:00 2001
+From: elsid
+Date: Thu, 30 Apr 2020 21:57:22 +0200
+Subject: [PATCH] Add missing include
+
+diff --git a/components/detournavigator/offmeshconnectionsmanager.hpp b/components/detournavigator/offmeshconnectionsmanager.hpp
+index 30d7976aec..155ce32963 100644
+--- a/components/detournavigator/offmeshconnectionsmanager.hpp
++++ b/components/detournavigator/offmeshconnectionsmanager.hpp
+@@ -13,6 +13,7 @@
+
+ #include
+
++#include
+ #include