summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt105
1 files changed, 90 insertions, 15 deletions
diff --git a/gentoo.txt b/gentoo.txt
index fdd137ce8eae..d1c9a6e9e5d4 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -28,23 +28,98 @@ or --ff-only on the command line to override the configured default per
invocation.
From https://anongit.gentoo.org/git/repo/gentoo
- 8245121a7b2..c060b553126 master -> origin/master
-You are not currently on a branch.
-Please specify which branch you want to merge with.
-See git-pull(1) for details.
-
- git pull <remote> <branch>
-
-*** syncing gentoo
-!!! failed syncing gentoo
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync gentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
-Updating files: 17% (14670/85836) Updating files: 18% (15451/85836) Updating files: 19% (16309/85836) Updating files: 20% (17168/85836) Updating files: 21% (18026/85836) Updating files: 22% (18884/85836) Updating files: 23% (19743/85836) Updating files: 24% (20601/85836) Updating files: 25% (21459/85836) Updating files: 26% (22318/85836) Updating files: 27% (23176/85836) Updating files: 28% (24035/85836) Updating files: 29% (24893/85836) Updating files: 30% (25751/85836) Updating files: 31% (26610/85836) Updating files: 32% (27468/85836) Updating files: 33% (28326/85836) Updating files: 34% (29185/85836) Updating files: 34% (29699/85836) Updating files: 35% (30043/85836) Updating files: 36% (30901/85836) Updating files: 37% (31760/85836) Updating files: 38% (32618/85836) Updating files: 39% (33477/85836) Updating files: 40% (34335/85836) Updating files: 41% (35193/85836) Updating files: 42% (36052/85836) Updating files: 43% (36910/85836) Updating files: 44% (37768/85836) Updating files: 45% (38627/85836) Updating files: 46% (39485/85836) Updating files: 47% (40343/85836) Updating files: 48% (41202/85836) Updating files: 49% (42060/85836) Updating files: 50% (42918/85836) Updating files: 51% (43777/85836) Updating files: 52% (44635/85836) Updating files: 53% (45494/85836) Updating files: 53% (46262/85836) Updating files: 54% (46352/85836) Updating files: 55% (47210/85836) Updating files: 56% (48069/85836) Updating files: 57% (48927/85836) Updating files: 58% (49785/85836) Updating files: 59% (50644/85836) Updating files: 60% (51502/85836) Updating files: 61% (52360/85836) Updating files: 62% (53219/85836) Updating files: 63% (54077/85836) Updating files: 64% (54936/85836) Updating files: 65% (55794/85836) Updating files: 66% (56652/85836) Updating files: 67% (57511/85836) Updating files: 68% (58369/85836) Updating files: 69% (59227/85836) Updating files: 70% (60086/85836) Updating files: 71% (60944/85836) Updating files: 72% (61802/85836) Updating files: 72% (62434/85836) Updating files: 73% (62661/85836) Updating files: 74% (63519/85836) Updating files: 75% (64377/85836) Updating files: 76% (65236/85836) Updating files: 77% (66094/85836) Updating files: 78% (66953/85836) Updating files: 79% (67811/85836) Updating files: 80% (68669/85836) Updating files: 81% (69528/85836) Updating files: 82% (70386/85836) Updating files: 83% (71244/85836) Updating files: 84% (72103/85836) Updating files: 85% (72961/85836) Updating files: 86% (73819/85836) Updating files: 87% (74678/85836) Updating files: 87% (74922/85836) Updating files: 88% (75536/85836) Updating files: 89% (76395/85836) Updating files: 90% (77253/85836) Updating files: 91% (78111/85836) Updating files: 92% (78970/85836) Updating files: 93% (79828/85836) Updating files: 94% (80686/85836) Updating files: 95% (81545/85836) Updating files: 96% (82403/85836) Updating files: 97% (83261/85836) Updating files: 98% (84120/85836) Updating files: 99% (84978/85836) Updating files: 100% (85836/85836) Updating files: 100% (85836/85836), done.
+ ee164b1b667..6ec745fba6c master -> origin/master
+Updating ee164b1b667..6ec745fba6c
+Fast-forward
+ app-emacs/auctex/auctex-12.3.ebuild | 2 +-
+ .../nxml-gentoo-schemas-20210314.ebuild | 2 +-
+ app-emacs/org-mode/org-mode-9.4.4.ebuild | 2 +-
+ app-misc/banner/banner-1.3.5.ebuild | 4 +-
+ app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild | 4 +-
+ dev-python/Faker/Faker-6.6.1.ebuild | 28 +++++
+ dev-python/Faker/Manifest | 1 +
+ dev-python/boto3/Manifest | 1 +
+ dev-python/boto3/boto3-1.17.28.ebuild | 56 +++++++++
+ dev-python/botocore/Manifest | 1 +
+ dev-python/botocore/botocore-1.20.28.ebuild | 59 +++++++++
+ dev-python/pikepdf/Manifest | 1 +
+ dev-python/pikepdf/pikepdf-2.9.0.ebuild | 51 ++++++++
+ dev-python/sqlalchemy/Manifest | 1 +
+ dev-python/sqlalchemy/sqlalchemy-1.4.0.ebuild | 59 +++++++++
+ dev-python/urllib3/Manifest | 1 +
+ dev-python/urllib3/urllib3-1.26.4.ebuild | 64 ++++++++++
+ media-gfx/engauge/engauge-10.6.ebuild | 4 +-
+ media-gfx/engauge/metadata.xml | 5 +-
+ net-analyzer/amap/amap-5.4-r1.ebuild | 2 +-
+ .../argus-clients/argus-clients-3.0.8.3.ebuild | 4 +-
+ net-analyzer/argus/argus-3.0.8.3-r1.ebuild | 2 +-
+ net-analyzer/arpwatch/arpwatch-3.1-r1.ebuild | 2 +-
+ net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild | 4 +-
+ net-analyzer/cutter/cutter-1.04.ebuild | 2 +-
+ net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild | 4 +-
+ .../flow-tools/flow-tools-0.68.6-r1.ebuild | 4 +-
+ net-analyzer/lft/lft-3.91-r1.ebuild | 4 +-
+ net-analyzer/nfdump/Manifest | 1 -
+ net-analyzer/nfdump/files/nfcapd.confd | 11 ++
+ net-analyzer/nfdump/files/nfcapd.initd | 60 ++++++++++
+ ...mp-1.6.21-remove-strict-rfc-7011-handling.patch | 49 ++++++++
+ net-analyzer/nfdump/metadata.xml | 8 +-
+ net-analyzer/nfdump/nfdump-1.6.20.ebuild | 63 ----------
+ ...fdump-1.6.21.ebuild => nfdump-1.6.21-r1.ebuild} | 4 +-
+ ...fdump-1.6.22.ebuild => nfdump-1.6.22-r1.ebuild} | 20 +++-
+ net-libs/libnet/files/libnet-1.2-int64_t.patch | 15 +++
+ net-libs/libnet/libnet-1.2.ebuild | 4 +
+ net-misc/modemmanager/files/modemmanager.initd | 11 ++
+ .../modemmanager/modemmanager-1.14.8-r1.ebuild | 132 +++++++++++++++++++++
+ x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild | 4 +-
+ x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild | 4 +-
+ x11-misc/dclock/dclock-2.2.2_p12.ebuild | 4 +-
+ x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild | 4 +-
+ .../lineak-defaultplugin-0.9.0-r2.ebuild | 4 +-
+ x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild | 4 +-
+ x11-misc/rofi/rofi-1.6.1.ebuild | 2 +-
+ x11-misc/sux/sux-1.0.1.ebuild | 4 +-
+ x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild | 4 +-
+ x11-misc/trayer/trayer-1.0-r4.ebuild | 4 +-
+ x11-misc/xautolock/xautolock-2.2_p7.ebuild | 4 +-
+ x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild | 4 +-
+ x11-misc/xdiskusage/xdiskusage-1.52.ebuild | 4 +-
+ x11-misc/xfishtank/xfishtank-2.5.ebuild | 4 +-
+ x11-misc/xkbd/xkbd-0.8.18.ebuild | 4 +-
+ x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild | 4 +-
+ x11-misc/xlockmore/xlockmore-5.65-r1.ebuild | 2 +-
+ x11-misc/xpad/Manifest | 2 -
+ x11-misc/xpad/xpad-4.2.ebuild | 27 -----
+ x11-misc/xpad/xpad-5.3.0.ebuild | 38 ------
+ x11-misc/xpad/xpad-5.4.0.ebuild | 4 +-
+ .../xscreensaver-app-2.3-r4.ebuild | 4 +-
+ x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild | 4 +-
+ x11-misc/xsnap/xsnap-1.5.15-r2.ebuild | 4 +-
+ x11-misc/xtrlock/xtrlock-2.13.ebuild | 4 +-
+ x11-misc/xwit/xwit-3.4_p16.ebuild | 4 +-
+ x11-misc/xxkb/xxkb-1.11.1-r1.ebuild | 2 +-
+ .../silver-xcursors/silver-xcursors-0.4-r1.ebuild | 4 +-
+ 68 files changed, 705 insertions(+), 208 deletions(-)
+ create mode 100644 dev-python/Faker/Faker-6.6.1.ebuild
+ create mode 100644 dev-python/boto3/boto3-1.17.28.ebuild
+ create mode 100644 dev-python/botocore/botocore-1.20.28.ebuild
+ create mode 100644 dev-python/pikepdf/pikepdf-2.9.0.ebuild
+ create mode 100644 dev-python/sqlalchemy/sqlalchemy-1.4.0.ebuild
+ create mode 100644 dev-python/urllib3/urllib3-1.26.4.ebuild
+ create mode 100644 net-analyzer/nfdump/files/nfcapd.confd
+ create mode 100644 net-analyzer/nfdump/files/nfcapd.initd
+ create mode 100644 net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch
+ delete mode 100644 net-analyzer/nfdump/nfdump-1.6.20.ebuild
+ rename net-analyzer/nfdump/{nfdump-1.6.21.ebuild => nfdump-1.6.21-r1.ebuild} (93%)
+ rename net-analyzer/nfdump/{nfdump-1.6.22.ebuild => nfdump-1.6.22-r1.ebuild} (75%)
+ create mode 100644 net-libs/libnet/files/libnet-1.2-int64_t.patch
+ create mode 100644 net-misc/modemmanager/files/modemmanager.initd
+ create mode 100644 net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild
+ delete mode 100644 x11-misc/xpad/xpad-4.2.ebuild
+ delete mode 100644 x11-misc/xpad/xpad-5.3.0.ebuild
*** syncing gentoo
*** synced gentoo
- * Sync succeeded after re-adding
+ * Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo