summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt53
1 files changed, 46 insertions, 7 deletions
diff --git a/gentoo.txt b/gentoo.txt
index 078b7a93b0fc..2c8bdb5cc547 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -11,16 +11,55 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/gentoo.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync gentoo
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
-Updating files: 17% (14886/87330) Updating files: 18% (15720/87330) Updating files: 19% (16593/87330) Updating files: 20% (17466/87330) Updating files: 21% (18340/87330) Updating files: 22% (19213/87330) Updating files: 23% (20086/87330) Updating files: 24% (20960/87330) Updating files: 25% (21833/87330) Updating files: 26% (22706/87330) Updating files: 27% (23580/87330) Updating files: 28% (24453/87330) Updating files: 29% (25326/87330) Updating files: 30% (26199/87330) Updating files: 31% (27073/87330) Updating files: 32% (27946/87330) Updating files: 33% (28819/87330) Updating files: 34% (29693/87330) Updating files: 34% (30564/87330) Updating files: 35% (30566/87330) Updating files: 36% (31439/87330) Updating files: 37% (32313/87330) Updating files: 38% (33186/87330) Updating files: 39% (34059/87330) Updating files: 40% (34932/87330) Updating files: 41% (35806/87330) Updating files: 42% (36679/87330) Updating files: 43% (37552/87330) Updating files: 44% (38426/87330) Updating files: 45% (39299/87330) Updating files: 46% (40172/87330) Updating files: 47% (41046/87330) Updating files: 48% (41919/87330) Updating files: 49% (42792/87330) Updating files: 50% (43665/87330) Updating files: 51% (44539/87330) Updating files: 52% (45412/87330) Updating files: 52% (45454/87330) Updating files: 53% (46285/87330) Updating files: 54% (47159/87330) Updating files: 55% (48032/87330) Updating files: 56% (48905/87330) Updating files: 57% (49779/87330) Updating files: 58% (50652/87330) Updating files: 59% (51525/87330) Updating files: 60% (52398/87330) Updating files: 61% (53272/87330) Updating files: 62% (54145/87330) Updating files: 63% (55018/87330) Updating files: 64% (55892/87330) Updating files: 65% (56765/87330) Updating files: 66% (57638/87330) Updating files: 67% (58512/87330) Updating files: 68% (59385/87330) Updating files: 69% (60258/87330) Updating files: 69% (60354/87330) Updating files: 70% (61131/87330) Updating files: 71% (62005/87330) Updating files: 72% (62878/87330) Updating files: 73% (63751/87330) Updating files: 74% (64625/87330) Updating files: 75% (65498/87330) Updating files: 76% (66371/87330) Updating files: 77% (67245/87330) Updating files: 78% (68118/87330) Updating files: 79% (68991/87330) Updating files: 80% (69864/87330) Updating files: 81% (70738/87330) Updating files: 81% (71572/87330) Updating files: 82% (71611/87330) Updating files: 83% (72484/87330) Updating files: 84% (73358/87330) Updating files: 85% (74231/87330) Updating files: 86% (75104/87330) Updating files: 87% (75978/87330) Updating files: 88% (76851/87330) Updating files: 89% (77724/87330) Updating files: 90% (78597/87330) Updating files: 91% (79471/87330) Updating files: 92% (80344/87330) Updating files: 93% (81217/87330) Updating files: 94% (82091/87330) Updating files: 95% (82964/87330) Updating files: 96% (83837/87330) Updating files: 97% (84711/87330) Updating files: 98% (85584/87330) Updating files: 99% (86457/87330) Updating files: 99% (86901/87330) Updating files: 100% (87330/87330) Updating files: 100% (87330/87330), done.
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+From https://anongit.gentoo.org/git/repo/gentoo
+ 97f0645314c..6f35bcada58 master -> origin/master
+Updating 97f0645314c..6f35bcada58
+Fast-forward
+ app-i18n/scim/scim-1.4.18.ebuild | 2 +-
+ ...lyx-2.3.5.2-r1.ebuild => lyx-2.3.5.2-r2.ebuild} | 20 +-
+ app-office/lyx/metadata.xml | 21 +-
+ app-office/texmacs/Manifest | 3 -
+ app-office/texmacs/files/texmacs-plugins-1.patch | 48 ---
+ app-office/texmacs/files/texmacs-updates.patch | 29 --
+ app-office/texmacs/texmacs-1.99.10.ebuild | 72 -----
+ app-office/texmacs/texmacs-1.99.6-r2.ebuild | 76 -----
+ app-office/texmacs/texmacs-1.99.9.ebuild | 72 -----
+ dev-libs/nss/nss-3.58.ebuild | 2 +-
+ net-fs/samba/Manifest | 3 +-
+ net-fs/samba/samba-4.11.11-r1.ebuild | 321 ---------------------
+ net-fs/samba/samba-4.12.7-r1.ebuild | 1 -
+ ...{samba-4.12.6-r1.ebuild => samba-4.12.8.ebuild} | 1 -
+ net-fs/samba/samba-4.13.0-r1.ebuild | 14 +-
+ profiles/base/package.use.mask | 9 -
+ profiles/package.mask | 16 +
+ sci-electronics/fritzing/Manifest | 2 -
+ sci-electronics/fritzing/fritzing-0.9.2b-r2.ebuild | 80 -----
+ 19 files changed, 47 insertions(+), 745 deletions(-)
+ rename app-office/lyx/{lyx-2.3.5.2-r1.ebuild => lyx-2.3.5.2-r2.ebuild} (92%)
+ delete mode 100644 app-office/texmacs/files/texmacs-plugins-1.patch
+ delete mode 100644 app-office/texmacs/files/texmacs-updates.patch
+ delete mode 100644 app-office/texmacs/texmacs-1.99.10.ebuild
+ delete mode 100644 app-office/texmacs/texmacs-1.99.6-r2.ebuild
+ delete mode 100644 app-office/texmacs/texmacs-1.99.9.ebuild
+ delete mode 100644 net-fs/samba/samba-4.11.11-r1.ebuild
+ rename net-fs/samba/{samba-4.12.6-r1.ebuild => samba-4.12.8.ebuild} (99%)
+ delete mode 100644 sci-electronics/fritzing/fritzing-0.9.2b-r2.ebuild
*** syncing gentoo
*** synced gentoo
* Sync succeeded