diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 44 |
1 files changed, 15 insertions, 29 deletions
diff --git a/gentoo.txt b/gentoo.txt index 57ce361ce1a5..5ea94907f263 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -26,37 +26,23 @@ or --ff-only on the command line to override the configured default per invocation. From https://anongit.gentoo.org/git/repo/gentoo - bed54c74378..7156eec31f6 master -> origin/master -Updating bed54c74378..7156eec31f6 -Fast-forward - gui-libs/tepl/tepl-4.2.1.ebuild | 4 +- - gui-libs/tepl/tepl-4.4.0.ebuild | 4 +- - ...08.0.ebuild => kdeutils-meta-20.08.0-r1.ebuild} | 1 + - media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch | 50 ++++++++++ - media-libs/ilmbase/ilmbase-2.5.2.ebuild | 2 + - media-video/plasma-mediacenter/Manifest | 1 - - media-video/plasma-mediacenter/metadata.xml | 8 -- - .../plasma-mediacenter-5.7.5.ebuild | 53 ---------- - net-mail/fetchmail/Manifest | 2 - - net-mail/fetchmail/fetchmail-6.4.1.ebuild | 108 --------------------- - net-mail/fetchmail/fetchmail-6.4.6.ebuild | 107 -------------------- - profiles/package.mask | 4 - - ...info-1.8.0.ebuild => libosinfo-1.8.0-r1.ebuild} | 4 +- - www-apps/owncloud/Manifest | 1 + - www-apps/owncloud/owncloud-10.5.0.ebuild | 47 +++++++++ - 15 files changed, 107 insertions(+), 289 deletions(-) - rename kde-apps/kdeutils-meta/{kdeutils-meta-20.08.0.ebuild => kdeutils-meta-20.08.0-r1.ebuild} (96%) - create mode 100644 media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch - delete mode 100644 media-video/plasma-mediacenter/Manifest - delete mode 100644 media-video/plasma-mediacenter/metadata.xml - delete mode 100644 media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild - delete mode 100644 net-mail/fetchmail/fetchmail-6.4.1.ebuild - delete mode 100644 net-mail/fetchmail/fetchmail-6.4.6.ebuild - rename sys-libs/libosinfo/{libosinfo-1.8.0.ebuild => libosinfo-1.8.0-r1.ebuild} (93%) - create mode 100644 www-apps/owncloud/owncloud-10.5.0.ebuild + 7156eec31f6..0a8b3266a23 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: 18% (16650/89461)
Updating files: 19% (16998/89461)
Updating files: 20% (17893/89461)
Updating files: 21% (18787/89461)
Updating files: 22% (19682/89461)
Updating files: 23% (20577/89461)
Updating files: 24% (21471/89461)
Updating files: 25% (22366/89461)
Updating files: 26% (23260/89461)
Updating files: 27% (24155/89461)
Updating files: 28% (25050/89461)
Updating files: 29% (25944/89461)
Updating files: 30% (26839/89461)
Updating files: 31% (27733/89461)
Updating files: 32% (28628/89461)
Updating files: 33% (29523/89461)
Updating files: 34% (30417/89461)
Updating files: 35% (31312/89461)
Updating files: 36% (32206/89461)
Updating files: 37% (33101/89461)
Updating files: 38% (33996/89461)
Updating files: 38% (34683/89461)
Updating files: 39% (34890/89461)
Updating files: 40% (35785/89461)
Updating files: 41% (36680/89461)
Updating files: 42% (37574/89461)
Updating files: 43% (38469/89461)
Updating files: 44% (39363/89461)
Updating files: 45% (40258/89461)
Updating files: 46% (41153/89461)
Updating files: 47% (42047/89461)
Updating files: 48% (42942/89461)
Updating files: 49% (43836/89461)
Updating files: 50% (44731/89461)
Updating files: 51% (45626/89461)
Updating files: 52% (46520/89461)
Updating files: 53% (47415/89461)
Updating files: 54% (48309/89461)
Updating files: 55% (49204/89461)
Updating files: 56% (50099/89461)
Updating files: 56% (50738/89461)
Updating files: 57% (50993/89461)
Updating files: 58% (51888/89461)
Updating files: 59% (52782/89461)
Updating files: 60% (53677/89461)
Updating files: 61% (54572/89461)
Updating files: 62% (55466/89461)
Updating files: 63% (56361/89461)
Updating files: 64% (57256/89461)
Updating files: 65% (58150/89461)
Updating files: 66% (59045/89461)
Updating files: 67% (59939/89461)
Updating files: 68% (60834/89461)
Updating files: 69% (61729/89461)
Updating files: 70% (62623/89461)
Updating files: 71% (63518/89461)
Updating files: 72% (64412/89461)
Updating files: 72% (64594/89461)
Updating files: 73% (65307/89461)
Updating files: 74% (66202/89461)
Updating files: 75% (67096/89461)
Updating files: 76% (67991/89461)
Updating files: 77% (68885/89461)
Updating files: 78% (69780/89461)
Updating files: 79% (70675/89461)
Updating files: 80% (71569/89461)
Updating files: 81% (72464/89461)
Updating files: 82% (73359/89461)
Updating files: 83% (74253/89461)
Updating files: 83% (74922/89461)
Updating files: 84% (75148/89461)
Updating files: 85% (76042/89461)
Updating files: 86% (76937/89461)
Updating files: 87% (77832/89461)
Updating files: 88% (78726/89461)
Updating files: 89% (79621/89461)
Updating files: 90% (80515/89461)
Updating files: 91% (81410/89461)
Updating files: 92% (82305/89461)
Updating files: 93% (83199/89461)
Updating files: 94% (84094/89461)
Updating files: 95% (84988/89461)
Updating files: 96% (85883/89461)
Updating files: 97% (86778/89461)
Updating files: 98% (87672/89461)
Updating files: 98% (87838/89461)
Updating files: 99% (88567/89461)
Updating files: 100% (89461/89461)
Updating files: 100% (89461/89461), done. *** syncing gentoo *** synced gentoo - * Sync succeeded + * Sync succeeded after re-adding $ git log --format=%ci -1 $ git show -q --pretty=format:%G? HEAD $ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo |