2021-04-09T23:00:01Z

1 files changed, 72 insertions, 74 deletions

diff --git a/gentoo.txt b/gentoo.txt
index a705247061df..4f2fefb870ba 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -12,6 +12,8 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/gentoo.git'}],
  'status': 'official'}
 $ pmaint sync gentoo
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gentoo
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
@@ -27,81 +29,77 @@ or --ff-only on the command line to override the configured default per
 invocation.
 
 From https://anongit.gentoo.org/git/repo/gentoo
-   63cb2ebe3a5..60c757d207a  master     -> origin/master
-Updating 63cb2ebe3a5..60c757d207a
+   60c757d207a..22aba2f719c  master     -> origin/master
+Updating 60c757d207a..22aba2f719c
 Fast-forward
- app-antivirus/clamav/clamav-0.103.2.ebuild         |   2 +-
- .../spice-protocol/spice-protocol-0.14.3.ebuild    |   2 +-
- app-emulation/spice/spice-0.14.3-r1.ebuild         |   2 +-
- dev-python/cssutils/Manifest                       |   1 -
- dev-python/cssutils/cssutils-1.0.2-r2.ebuild       |  56 ---------
- dev-python/cssutils/cssutils-2.0.0.ebuild          |   2 +-
- dev-python/defcon/Manifest                         |   2 -
- dev-python/defcon/defcon-0.6.0-r1.ebuild           |  25 ----
- dev-python/defcon/defcon-0.7.2.ebuild              |  25 ----
- dev-python/defcon/defcon-0.8.0.ebuild              |   2 +-
- dev-python/hypothesis/Manifest                     |   7 --
- dev-python/hypothesis/hypothesis-6.3.4.ebuild      |  63 ----------
- dev-python/hypothesis/hypothesis-6.6.0.ebuild      |   2 +-
- dev-python/hypothesis/hypothesis-6.8.3.ebuild      |  62 ----------
- dev-python/hypothesis/hypothesis-6.8.4.ebuild      |  62 ----------
- dev-python/hypothesis/hypothesis-6.8.5.ebuild      |  62 ----------
- dev-python/hypothesis/hypothesis-6.8.6.ebuild      |  62 ----------
- dev-python/hypothesis/hypothesis-6.8.7.ebuild      |  62 ----------
- dev-python/hypothesis/hypothesis-6.8.8.ebuild      |  62 ----------
- dev-python/importlib_metadata/Manifest             |   1 -
- .../importlib_metadata-3.7.0.ebuild                |  42 -------
- .../importlib_metadata-3.7.2.ebuild                |   2 +-
- dev-python/keyring/Manifest                        |   1 -
- dev-python/keyring/keyring-22.3.0.ebuild           |  43 -------
- dev-python/keyring/keyring-23.0.0.ebuild           |   2 +-
- dev-python/pockets/pockets-0.9.1-r1.ebuild         |   2 +-
- dev-python/pygments/Manifest                       |   1 -
- dev-python/pygments/pygments-2.8.0.ebuild          |  45 --------
- dev-python/pygments/pygments-2.8.1.ebuild          |   2 +-
- dev-python/sphinx/Manifest                         |   1 -
- dev-python/sphinx/sphinx-3.5.1.ebuild              | 127 ---------------------
- dev-python/sphinx/sphinx-3.5.2.ebuild              |   2 +-
- dev-python/urlgrabber/Manifest                     |   1 -
- dev-python/urlgrabber/urlgrabber-4.0.0-r1.ebuild   |  26 -----
- dev-python/urlgrabber/urlgrabber-4.1.0.ebuild      |   2 +-
- dev-python/waitress/Manifest                       |   1 -
- dev-python/waitress/waitress-1.4.4.ebuild          |  26 -----
- dev-python/waitress/waitress-2.0.0.ebuild          |   2 +-
- .../gtk-update-icon-cache-3.24.26.ebuild           |   2 +-
- media-sound/quodlibet/quodlibet-4.4.0.ebuild       |   2 +-
- net-analyzer/speedtest-cli/Manifest                |   2 +-
- ...-2.1.2-r1.ebuild => speedtest-cli-2.1.3.ebuild} |   0
- net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild         |   2 +-
- net-ftp/atftp/atftp-0.7.4.ebuild                   |   2 +-
- net-libs/libtirpc/libtirpc-1.3.1.ebuild            |   2 +-
- net-misc/netifrc/netifrc-0.7.3.ebuild              |   2 +-
- net-p2p/syncthing/syncthing-1.15.1.ebuild          |   2 +-
- x11-libs/gtk+/gtk+-3.24.26.ebuild                  |   2 +-
- xfce-base/thunar/thunar-4.16.6.ebuild              |   2 +-
- xfce-base/xfce4-panel/xfce4-panel-4.16.2.ebuild    |   2 +-
- .../xfce4-cpufreq-plugin-1.2.5.ebuild              |   2 +-
- .../xfce4-netload-plugin-1.4.0.ebuild              |   2 +-
- .../xfce4-systemload-plugin-1.3.1.ebuild           |   2 +-
- .../xfce4-time-out-plugin-1.1.2.ebuild             |   2 +-
- 54 files changed, 28 insertions(+), 894 deletions(-)
- delete mode 100644 dev-python/cssutils/cssutils-1.0.2-r2.ebuild
- delete mode 100644 dev-python/defcon/defcon-0.6.0-r1.ebuild
- delete mode 100644 dev-python/defcon/defcon-0.7.2.ebuild
- delete mode 100644 dev-python/hypothesis/hypothesis-6.3.4.ebuild
- delete mode 100644 dev-python/hypothesis/hypothesis-6.8.3.ebuild
- delete mode 100644 dev-python/hypothesis/hypothesis-6.8.4.ebuild
- delete mode 100644 dev-python/hypothesis/hypothesis-6.8.5.ebuild
- delete mode 100644 dev-python/hypothesis/hypothesis-6.8.6.ebuild
- delete mode 100644 dev-python/hypothesis/hypothesis-6.8.7.ebuild
- delete mode 100644 dev-python/hypothesis/hypothesis-6.8.8.ebuild
- delete mode 100644 dev-python/importlib_metadata/importlib_metadata-3.7.0.ebuild
- delete mode 100644 dev-python/keyring/keyring-22.3.0.ebuild
- delete mode 100644 dev-python/pygments/pygments-2.8.0.ebuild
- delete mode 100644 dev-python/sphinx/sphinx-3.5.1.ebuild
- delete mode 100644 dev-python/urlgrabber/urlgrabber-4.0.0-r1.ebuild
- delete mode 100644 dev-python/waitress/waitress-1.4.4.ebuild
- rename net-analyzer/speedtest-cli/{speedtest-cli-2.1.2-r1.ebuild => speedtest-cli-2.1.3.ebuild} (100%)
+ dev-java/protobuf-java/Manifest                    |  11 +-
+ ...a-3.12.4.ebuild => protobuf-java-3.15.0.ebuild} |   4 +-
+ ...a-3.12.2.ebuild => protobuf-java-3.15.1.ebuild} |   7 +-
+ dev-java/protobuf-java/protobuf-java-3.15.2.ebuild |  56 +++++++++
+ dev-java/protobuf-java/protobuf-java-3.15.3.ebuild |  56 +++++++++
+ dev-java/protobuf-java/protobuf-java-3.15.4.ebuild |  56 +++++++++
+ dev-java/protobuf-java/protobuf-java-3.15.5.ebuild |  56 +++++++++
+ dev-java/protobuf-java/protobuf-java-3.15.6.ebuild |  56 +++++++++
+ dev-java/protobuf-java/protobuf-java-3.15.7.ebuild |  56 +++++++++
+ dev-java/protobuf-java/protobuf-java-3.15.8.ebuild |  56 +++++++++
+ dev-libs/protobuf/Manifest                         |  11 +-
+ ... protobuf-3.15.0-disable_no-warning-test.patch} |   4 +-
+ ...rotobuf-3.15.0-protoc_input_output_files.patch} | 136 +++++++++------------
+ ...atch => protobuf-3.15.0-system_libraries.patch} |  10 +-
+ ...otobuf-3.12.4.ebuild => protobuf-3.15.0.ebuild} |  14 +--
+ ...otobuf-3.12.2.ebuild => protobuf-3.15.1.ebuild} |  15 ++-
+ dev-libs/protobuf/protobuf-3.15.2.ebuild           | 131 ++++++++++++++++++++
+ dev-libs/protobuf/protobuf-3.15.3.ebuild           | 131 ++++++++++++++++++++
+ dev-libs/protobuf/protobuf-3.15.4.ebuild           | 131 ++++++++++++++++++++
+ dev-libs/protobuf/protobuf-3.15.5.ebuild           | 131 ++++++++++++++++++++
+ dev-libs/protobuf/protobuf-3.15.6.ebuild           | 131 ++++++++++++++++++++
+ dev-libs/protobuf/protobuf-3.15.7.ebuild           | 131 ++++++++++++++++++++
+ dev-libs/protobuf/protobuf-3.15.8.ebuild           | 131 ++++++++++++++++++++
+ dev-libs/protobuf/protobuf-9999.ebuild             |   6 +-
+ dev-python/protobuf-python/Manifest                |  11 +-
+ ...2.4-r1.ebuild => protobuf-python-3.15.0.ebuild} |  13 +-
+ ...2.2-r1.ebuild => protobuf-python-3.15.1.ebuild} |  15 +--
+ .../protobuf-python/protobuf-python-3.15.2.ebuild  |  66 ++++++++++
+ .../protobuf-python/protobuf-python-3.15.3.ebuild  |  66 ++++++++++
+ .../protobuf-python/protobuf-python-3.15.4.ebuild  |  66 ++++++++++
+ .../protobuf-python/protobuf-python-3.15.5.ebuild  |  66 ++++++++++
+ .../protobuf-python/protobuf-python-3.15.6.ebuild  |  66 ++++++++++
+ .../protobuf-python/protobuf-python-3.15.7.ebuild  |  66 ++++++++++
+ .../protobuf-python/protobuf-python-3.15.8.ebuild  |  66 ++++++++++
+ net-misc/bird/metadata.xml                         |   8 ++
+ profiles/base/package.use.mask                     |  12 ++
+ profiles/use.desc                                  |   1 +
+ 37 files changed, 1918 insertions(+), 131 deletions(-)
+ rename dev-java/protobuf-java/{protobuf-java-3.12.4.ebuild => protobuf-java-3.15.0.ebuild} (93%)
+ rename dev-java/protobuf-java/{protobuf-java-3.12.2.ebuild => protobuf-java-3.15.1.ebuild} (92%)
+ create mode 100644 dev-java/protobuf-java/protobuf-java-3.15.2.ebuild
+ create mode 100644 dev-java/protobuf-java/protobuf-java-3.15.3.ebuild
+ create mode 100644 dev-java/protobuf-java/protobuf-java-3.15.4.ebuild
+ create mode 100644 dev-java/protobuf-java/protobuf-java-3.15.5.ebuild
+ create mode 100644 dev-java/protobuf-java/protobuf-java-3.15.6.ebuild
+ create mode 100644 dev-java/protobuf-java/protobuf-java-3.15.7.ebuild
+ create mode 100644 dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
+ rename dev-libs/protobuf/files/{protobuf-3.12.0-disable_no-warning-test.patch => protobuf-3.15.0-disable_no-warning-test.patch} (95%)
+ rename dev-libs/protobuf/files/{protobuf-3.12.0-protoc_input_output_files.patch => protobuf-3.15.0-protoc_input_output_files.patch} (63%)
+ rename dev-libs/protobuf/files/{protobuf-3.12.0-system_libraries.patch => protobuf-3.15.0-system_libraries.patch} (98%)
+ rename dev-libs/protobuf/{protobuf-3.12.4.ebuild => protobuf-3.15.0.ebuild} (84%)
+ rename dev-libs/protobuf/{protobuf-3.12.2.ebuild => protobuf-3.15.1.ebuild} (83%)
+ create mode 100644 dev-libs/protobuf/protobuf-3.15.2.ebuild
+ create mode 100644 dev-libs/protobuf/protobuf-3.15.3.ebuild
+ create mode 100644 dev-libs/protobuf/protobuf-3.15.4.ebuild
+ create mode 100644 dev-libs/protobuf/protobuf-3.15.5.ebuild
+ create mode 100644 dev-libs/protobuf/protobuf-3.15.6.ebuild
+ create mode 100644 dev-libs/protobuf/protobuf-3.15.7.ebuild
+ create mode 100644 dev-libs/protobuf/protobuf-3.15.8.ebuild
+ rename dev-python/protobuf-python/{protobuf-python-3.12.4-r1.ebuild => protobuf-python-3.15.0.ebuild} (80%)
+ rename dev-python/protobuf-python/{protobuf-python-3.12.2-r1.ebuild => protobuf-python-3.15.1.ebuild} (79%)
+ create mode 100644 dev-python/protobuf-python/protobuf-python-3.15.2.ebuild
+ create mode 100644 dev-python/protobuf-python/protobuf-python-3.15.3.ebuild
+ create mode 100644 dev-python/protobuf-python/protobuf-python-3.15.4.ebuild
+ create mode 100644 dev-python/protobuf-python/protobuf-python-3.15.5.ebuild
+ create mode 100644 dev-python/protobuf-python/protobuf-python-3.15.6.ebuild
+ create mode 100644 dev-python/protobuf-python/protobuf-python-3.15.7.ebuild
+ create mode 100644 dev-python/protobuf-python/protobuf-python-3.15.8.ebuild
 *** synced gentoo
  * Sync succeeded
 $ git log --format=%ci -1