gentoo resync : 30.09.2020

22 files changed, 13 insertions, 1051 deletions

diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index 73e34210ddc2..63508216c066 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -1,37 +1,3 @@
-AUX github-backup-utils-python27.patch 497 BLAKE2B 204708abe587590b2479783f5fc355ab035a08af8dd85ccec600828384917ca6806abe3d50ada9ce133435b797d698699d777432e49f8a63513b2ae21e59baaf SHA512 9eb416ea2a9847d84d56da84c6355942f3320f8ed97711e602ab74e81f9dca32eff54f68a83586403c415e63fb7d13a0b6b67aa7b01cd05732160df08b9164a7
-AUX github-backup-utils-tarball-fix.patch 1440 BLAKE2B 8b6ff7b996317de913f82670da1e688bfb2796b51db9cb515a6a2d33d2f690e24030b9213c0ebd08fab316aded4d561f9b0d5e2fb1fc5f20d0190234e59e64af SHA512 738227c94b8c9cb569258ce2573db0ff9c8a216c74d891944969173add6eb31c0c46696d20977d986b5c29a9cdb2b3934563ed220527ef798de1cbeb680f6533
-DIST github-backup-utils-2.10.0.tar.gz 73061 BLAKE2B 072a3cf8b3a775b368e4f5c89f7b9b29f7fec26bf4fd9abec58a6f1d4f02a981881a547bbdede8f8b64d0ed01dfba334193132a5d1363de3f4cd8f11d9047602 SHA512 e4ec432289da71e7c8d50023e4874b4aef5e99b27f67c42ebadc61473f5b0bce473f768ff19d1d611d91944ce887ad496535f1bc8d6557a31a99353e100f7776
-DIST github-backup-utils-2.11.0.tar.gz 75105 BLAKE2B f14f30db263cc304aac0d2a9a6d82883067b80bd69292018876fa1b01b1e47d9f8dd44bdafed0eb1198fdabe2b25ec8e6f20117ae905a2ae17bb9a17174642ea SHA512 7d96aff4c2e2bcce7b2b2d32854e759d561de8e683a13d3890bbbc5177cea861a666a60527b4b6ec4d4d7e8123bfff4618b6dfd0c3db73b1829cca0c43c0a9ec
-DIST github-backup-utils-2.11.1.tar.gz 79378 BLAKE2B d887cf6d3e41c1537816edc6073a85c66dcaae0db5882187f5c9202ecaef0c7ad6c3593145a6619cc27e106cacd5343f4b26615569890e112db4ec67f98293f6 SHA512 7bdd34386d8604bfddb07d958d6cc435ec3e00705a83e53730f44a82a02eb98be311b73bba299db80513169a0680641927d9e2e9583b936c4fffa86de2ce2cda
-DIST github-backup-utils-2.11.2.tar.gz 79492 BLAKE2B 0eeba783fda89c862d1b6ecb56bc51dcb5130cc3ae8b35f38bba2b6fd850ee086d0b808f5cebb74617a1dea2f4ea3843c60a6162ac97e3139211b3796cc052d9 SHA512 64a622b090c8fe02ffba3c50b213ca177cc87e6aa41991cc3ee5031fc07b707e5f108f32d9346d2cd727939d76779d1f46dc6733e399c70e58ff8cb54087ddb8
-DIST github-backup-utils-2.13.0.tar.gz 79173 BLAKE2B 567865ede11d200a9dbc4641d9820864d72a325aa6b6439f3633b5fccf2d2a55fdd8f9351a280321d0ee5a1bc7f331369ed09b2e8e5274a9442f98227c82963c SHA512 e78c299b0131d76bd9f5d916f72a1a361a8ea706789c93d60b1980d348c4dad75e371ad84c725d8d8b05c45984d0edcf612d1a9e69e63657c212a848d359ad28
-DIST github-backup-utils-2.13.2.tar.gz 83126 BLAKE2B f79d378a1126a16f366930a40ca6db43865c2615edb65b13a3b4a1ac693f3f3419f6b821ec4454cd2b4858fd13038ca66e158c37338b671f69f14aca2e36c6de SHA512 b394dfde420d2f1adbaad6b61a665fa99e6a35007fd5162114ec01629a04be31780f3f36e9133456bbb015c6a3939430b5d65572e580d8757f023a2309d104ca
-DIST github-backup-utils-2.14.2.tar.gz 84628 BLAKE2B 579088448da16330083ee4ffbbd2d9e286eac7bf89bc9146bb4eaed8aee42971238ea997625da2e5c6f10097b329ffb7db876aab20acdbe7d17c1a8bcb9a3801 SHA512 6a93861441388866ba57c8be13ece0df6967e711fd643138c00490ce439fb74d29ceb5b482f6315d1a47df0cb90ab4a835bb25bdcc92172f5f200b5900108bd4
-DIST github-backup-utils-2.15.0.tar.gz 84856 BLAKE2B cc31d45711d4b26d246e08565b48bf5b65e3c6127bbeb01064273e4bcc8e3f3b5fd8e439cd4717c4c8d103113b00eba4ed670737169ce6ffa7a8256b08386e01 SHA512 3294641c8220cd7d5e212e47b7011f188432e5e6437e6d97a9d6c38182fd451a0229588ee28872d5c1bb1b0cab93eb612586a268761d42cb763f38ad13ec0ab4
-DIST github-backup-utils-2.15.1.tar.gz 84627 BLAKE2B 14f448a8c15b45cdf2a2868d70d90bd91228bbeb3d7534fd89ed1812fd1bcc52e9720d4063fc33f9463035eb34736c919c888c17b2602ebb772fdef4830592f5 SHA512 72a0c70ef629f17a2b3be12661379a94150181c0ac87803e4490a9b927e84760917e936e3346d2da6a0ec004ef8fa9b1297b41341bce115a2dd26bbcc62c1843
-DIST github-backup-utils-2.16.1.tar.gz 84847 BLAKE2B 5c6c0cbe8268ae176321739582783e920454efbebb62a0058ceeddb675a46050db3126897054c0120a74bcfa16bd28b4dd311cbd6a5e23dac262a49bc026c90d SHA512 bde17ed47ec0b89fd95e0a018cc0709045da6f27ffbf492d555219a09e3fcca612d67da1e0d5786fa8ea08a7eaa6d183dc1d40fd45d7bace5d05899ae0007fcb
-DIST github-backup-utils-2.17.0.tar.gz 89926 BLAKE2B 82e89d616f78d630a4c537ad110f1097fd4925f9d0b45ebd117a5f4dbce21ec84bddd1f7a2cfebc52464e8fff9117bd4b0cc5e862e666d4b3d05f11a9b88730d SHA512 aeae5d5f662a687e13ff0aed54801759480ba39e31f0ad49a9ecc4fabad5aa5e124e774c7b939a366a33135e81614d1cee6f1004481bbe94150b48a11f222a90
-DIST github-backup-utils-2.18.0.tar.gz 90357 BLAKE2B e9f6c155246914a36d26ec8cddf4a1e9feca73b3450ceb8e6df11df7c077b86f18cfa23b51e77425ba4e28ce4a3664200c1ddb15e6eb856d6b8930379dd3e348 SHA512 1778bf4cf404444e567f9f6b98bcd01bf9880939b4645692d75dbf10e7b31b40678521b66fbdabfedef648561f34709492b7860ce16442757e161db2ffda45a2
-DIST github-backup-utils-2.19.1.tar.gz 90260 BLAKE2B 403feca60cc6037a2fbcb4cc467520fb3283916fdc78e16e960656b695e1c55341c55e74fe246c56fbc2cd86a85e33bcede4d94132adaa446ea48ed8f3f75022 SHA512 60155021d23eadc5ab1ddcadf95dbab43f19456c0e7ef34e93c75d173c1279b354c7019b304d72cabcac674edbd0c4a0c4e50c08606a8559ea662858a9cdb206
-DIST github-backup-utils-2.20.2.tar.gz 92628 BLAKE2B a6c9fb91b005d20b15ce0b2fc289a145bbfd8316aca4511300cda8a9f1b1e52afb9619a9f467e6e87eec673244776a0bf469d0d4a4c608af0f462eae7a06dc44 SHA512 0d2c56fd2e98c8f858cf3a03e2c2d84c20555716d015cdf1f0a789171cb6ea301050a41d1314a15316258f3f159123ba21526c1fd69cba548e8f259c70a92ab9
-DIST github-backup-utils-2.21.0.tar.gz 89907 BLAKE2B 4261d127a73bc4701521f6c5078444c38b3d97ac4ab883f644e02057090b8a53b6c86849b988175416b6fb0566327b9938f28887417fef109dd59c1b246cf961 SHA512 fc037d180ce6cb238d4613583a1551256ffbc58ec8276945905c0127fb6e29f7d547dfdcbec30bb581202ce0447365642218e18ed8865f01e76037898d0a5126
-EBUILD github-backup-utils-2.10.0-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
-EBUILD github-backup-utils-2.10.0.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
-EBUILD github-backup-utils-2.11.0-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
-EBUILD github-backup-utils-2.11.0.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
-EBUILD github-backup-utils-2.11.1-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
-EBUILD github-backup-utils-2.11.1.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
-EBUILD github-backup-utils-2.11.2-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
-EBUILD github-backup-utils-2.11.2.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
-EBUILD github-backup-utils-2.13.0.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.13.2.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.14.2.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.15.0.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.15.1.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.16.1.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.17.0.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.18.0.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
-EBUILD github-backup-utils-2.19.1.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
-EBUILD github-backup-utils-2.20.2.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
-EBUILD github-backup-utils-2.21.0.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
+DIST github-backup-utils-2.22.0.tar.gz 102576 BLAKE2B ce9007c8a5d2843ccc2b3d11b03c13840b89d6ae7906d63420cc0e18191766c92c91e1072723439610ae8bdfdd0174601d1e3b7211cd6a1c9a748f9f793ff760 SHA512 e77b4afc6f90b16caf61dc4313787dab0751590b4819dca2d7e21acd0ca774d19ea359171b76f2892ca0fb4f86fd4240e77b00e107de79d496fea429fb12cee8
+EBUILD github-backup-utils-2.22.0.ebuild 1126 BLAKE2B 9e16911d27c5813a8e08cc387462a9c74d7deb4c848c3529e30c682e75588e7ef10bc458932a2eee7f9a6d8fda14e7d7c0648512f56e072c4b5756f04b0af689 SHA512 90b8a464f4eb4a245f9aa97797478fc72208d609ae633987251960600e34fb2c13dcafc209629aac7edcbf3360c45757a24b052c5ac64f39d677ce38d9e37346
 MISC metadata.xml 342 BLAKE2B 9f590d0c03e75e395500a57d1b99020742fb9fc04835b6fca8a896435dec7ba274204df2c5356ec1ef101f721a4bafdb848299c57b209c8d9aa41efdeb674e8f SHA512 5a9f0cb678377962ec6e4cf33ed40423e568f15cb71dfe5dd87e427a21584043e5698bbb2baa5b77907bf8f15c9ad8cfa8b05b4fdcdf2c8876ceb968afcb2d07
diff --git a/app-admin/github-backup-utils/files/github-backup-utils-python27.patch b/app-admin/github-backup-utils/files/github-backup-utils-python27.patch
deleted file mode 100644
index c305b688ceca..000000000000
--- a/app-admin/github-backup-utils/files/github-backup-utils-python27.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test/bin/python b/test/bin/python
-index c79b0a4..a9c2991 100755
---- a/test/bin/python
-+++ b/test/bin/python
-@@ -18,7 +18,7 @@ cat >/dev/null
- # verify the python compiles at least. if this fails then the python code passed
- # to -c failed basic syntax checks.
- echo "$2" |
--/usr/bin/python -c "import sys; __import__('compiler').parse(sys.stdin.read())"
-+/usr/bin/python2.7 -c "import sys; __import__('compiler').parse(sys.stdin.read())"
- 
- # pretend we found zero processes.
- echo 0
diff --git a/app-admin/github-backup-utils/files/github-backup-utils-tarball-fix.patch b/app-admin/github-backup-utils/files/github-backup-utils-tarball-fix.patch
deleted file mode 100644
index b0f0b8de3140..000000000000
--- a/app-admin/github-backup-utils/files/github-backup-utils-tarball-fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit ef6709b5e3510a7d0bcf0db91dbf5af5bc27b001
-Author: Austin English <austinenglish@gmail.com>
-Date:   Tue Nov 28 16:36:39 2017 -0600
-
-    test/test-ghe-backup.sh: skip test if not in a git checkout
-
-diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
-index 296429e..08bced2 100755
---- a/test/test-ghe-backup.sh
-+++ b/test/test-ghe-backup.sh
-@@ -475,14 +475,20 @@ begin_test "ghe-backup stores version when not run from a clone"
-   # Make sure this doesn't exist
-   rm -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version"
- 
--  tmpdir=$(mktemp -d $TRASHDIR/foo.XXXXXX)
--  git clone $ROOTDIR $tmpdir/backup-utils
--  cd $tmpdir/backup-utils
--  rm -rf .git
--  ./bin/ghe-backup
--
--  # verify that ghe-backup wrote its version information to the host
--  [ -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version" ]
-+  tmpdir=$(mktemp -d "$TRASHDIR/foo.XXXXXX")
-+
-+  # If user is running the tests extracted from a release tarball, git clone will fail.
-+  if GIT_DIR="$ROOTDIR/.git" git rev-parse --is-inside-work-tree > /dev/null 2>&1; then
-+      git clone "$ROOTDIR" "$tmpdir/backup-utils"
-+      cd "$tmpdir/backup-utils"
-+      rm -rf .git
-+      ./bin/ghe-backup
-+
-+      # Verify that ghe-backup wrote its version information to the host
-+      [ -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version" ]
-+  else
-+      echo ".git directory not found, skipping ghe-backup not from a clone test"
-+  fi
- )
- end_test
- 
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild
deleted file mode 100644
index fb7dd4be7234..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
-	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
-
-	# Fix for python3 systems
-	eapply "${FILESDIR}/github-backup-utils-python27.patch"
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
deleted file mode 100644
index c7f2534ca0c2..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild
deleted file mode 100644
index fb7dd4be7234..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
-	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
-
-	# Fix for python3 systems
-	eapply "${FILESDIR}/github-backup-utils-python27.patch"
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
deleted file mode 100644
index c7f2534ca0c2..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild
deleted file mode 100644
index fb7dd4be7234..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
-	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
-
-	# Fix for python3 systems
-	eapply "${FILESDIR}/github-backup-utils-python27.patch"
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild
deleted file mode 100644
index c7f2534ca0c2..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild
deleted file mode 100644
index fb7dd4be7234..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
-	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
-
-	# Fix for python3 systems
-	eapply "${FILESDIR}/github-backup-utils-python27.patch"
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild
deleted file mode 100644
index c7f2534ca0c2..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.14.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.14.2.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.14.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.15.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.15.0.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.15.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.16.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.16.1.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.16.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.17.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.17.0.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.17.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.19.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.19.1.ebuild
deleted file mode 100644
index 9a251dd782d8..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.19.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.20.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.20.2.ebuild
deleted file mode 100644
index 9a251dd782d8..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.20.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.21.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.21.0.ebuild
deleted file mode 100644
index 9a251dd782d8..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.21.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.18.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.22.0.ebuild
index 9a251dd782d8..cdc41c6dad52 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.18.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.22.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
+# Python3 support: https://github.com/github/backup-utils/pull/627
+PYTHON_COMPAT=(python3_{6,7,8})
 inherit python-any-r1
 
 DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
@@ -17,14 +17,18 @@ KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+# moreutils parallel is now used for speedups in main code:
+# https://github.com/github/backup-utils/pull/635
+RDEPEND="net-misc/rsync
+	sys-apps/moreutils"
+
+# tests invoke parallel & rsync
 DEPEND="test? (
+	${RDEPEND}
 	dev-util/checkbashisms
-	sys-apps/moreutils
 	${PYTHON_DEPS}
 )"
 
-RDEPEND="net-misc/rsync"
-
 MY_PN="${PN/#github-/}"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
@@ -44,7 +48,7 @@ src_install() {
 	insinto etc/${PN}
 	newins backup.config-example backup.config
 
-dodoc -r docs/*
+	dodoc -r docs/*
 }
 
 src_test() {