diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 106 |
1 files changed, 15 insertions, 91 deletions
diff --git a/gentoo.txt b/gentoo.txt index fbb7cbd469a3..92f4016a14cf 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -13,99 +13,23 @@ 'status': 'official'} $ pmaint sync gentoo From https://anongit.gentoo.org/git/repo/gentoo - 2c86a172d8c..266410b6f40 master -> origin/master -Updating 2c86a172d8c..266410b6f40 -Fast-forward - app-admin/abrt/abrt-2.12.0-r1.ebuild | 2 +- - app-admin/sysstat/sysstat-12.2.1.ebuild | 2 +- - app-antivirus/clamav/clamav-0.102.1-r3.ebuild | 2 +- - app-arch/file-roller/file-roller-3.32.3.ebuild | 2 +- - app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild | 2 +- - app-crypt/gcr/gcr-3.34.0-r1.ebuild | 2 +- - .../seahorse-sharing-3.8.0_p20181216.ebuild | 2 +- - .../gedit-plugins/gedit-plugins-3.32.2-r1.ebuild | 2 +- - app-editors/gedit/gedit-3.32.2-r1.ebuild | 2 +- - app-office/grisbi/grisbi-1.2.2.ebuild | 2 +- - app-shells/zsh/zsh-5.7.1-r1.ebuild | 2 +- - .../gnome-doc-utils-0.20.10-r2.ebuild | 2 +- - dev-lang/go/go-1.12.15.ebuild | 4 +- - dev-lang/php/php-7.2.27.ebuild | 2 +- - dev-lang/php/php-7.3.14.ebuild | 2 +- - dev-lang/vala/vala-0.40.18.ebuild | 2 +- - dev-lang/vala/vala-0.44.11.ebuild | 2 +- - .../appstream-glib/appstream-glib-0.7.16.ebuild | 2 +- - dev-libs/glib/glib-2.60.7-r1.ebuild | 2 +- - dev-libs/gmime/gmime-3.2.5.ebuild | 2 +- - dev-libs/libgusb/libgusb-0.3.2.ebuild | 2 +- - dev-libs/libical/libical-3.0.7.ebuild | 2 +- - dev-libs/libpwquality/libpwquality-1.4.2.ebuild | 2 +- - dev-libs/libreport/libreport-2.10.0.ebuild | 2 +- - dev-libs/libressl/libressl-3.0.2.ebuild | 2 +- - dev-libs/satyr/satyr-0.27.ebuild | 2 +- - .../totem-pl-parser/totem-pl-parser-3.26.4.ebuild | 2 +- - dev-libs/vala-common/vala-common-0.44.11.ebuild | 2 +- - dev-python/PySocks/PySocks-1.7.1.ebuild | 7 +- - dev-python/carbon/Manifest | 1 - - dev-python/carbon/carbon-0.9.13-r1.ebuild | 64 --------- - dev-python/carbon/carbon-0.9.13.ebuild | 64 --------- - .../carbon/files/carbon-0.9.12-no-data-files.patch | 24 ---- - dev-python/carbon/files/no-data-files.patch | 26 ---- - dev-python/nevow/Manifest | 1 - - dev-python/nevow/nevow-0.11.1.ebuild | 40 ------ - dev-python/simplejson/simplejson-3.17.0.ebuild | 2 +- - dev-util/buildbot/Manifest | 1 - - dev-util/buildbot/buildbot-0.8.12-r3.ebuild | 148 --------------------- - .../gtk-update-icon-cache-3.24.13.ebuild | 2 +- - gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild | 2 +- - gnome-extra/eiciel/eiciel-0.9.12.1-r1.ebuild | 2 +- - gnome-extra/libgsf/libgsf-1.14.46.ebuild | 2 +- - gnome-extra/zenity/zenity-3.32.0.ebuild | 2 +- - gui-libs/tepl/tepl-4.2.1.ebuild | 2 +- - media-gfx/shotwell/shotwell-0.30.8.ebuild | 2 +- - media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild | 2 +- - .../alsa-topology-conf-1.2.1.ebuild | 2 +- - .../alsa-ucm-conf/alsa-ucm-conf-1.2.1.2.ebuild | 2 +- - media-libs/clutter/clutter-1.26.2-r2.ebuild | 2 +- - media-libs/grilo/grilo-0.3.11.ebuild | 2 +- - .../alsa-plugins/alsa-plugins-1.2.1.ebuild | 2 +- - media-sound/alsa-utils/alsa-utils-1.2.1.ebuild | 2 +- - net-ftp/ncftp/files/ncftp-3.2.6-fno-common.patch | 68 ++++++++++ - net-ftp/ncftp/ncftp-3.2.6-r1.ebuild | 49 +++++++ - .../glib-networking/glib-networking-2.60.4.ebuild | 2 +- - net-misc/modemmanager/modemmanager-1.10.0.ebuild | 2 +- - .../networkmanager/networkmanager-1.18.4-r3.ebuild | 2 +- - net-vpn/tor/tor-0.4.2.5.ebuild | 2 +- - profiles/base/package.use.mask | 5 + - profiles/package.mask | 29 ++++ - .../gnome-maps/gnome-maps-3.34.3.ebuild | 2 +- - sci-libs/proj/proj-6.2.1.ebuild | 4 +- - sys-apps/systemd/systemd-244.ebuild | 2 +- - sys-block/gparted/gparted-1.0.0.ebuild | 2 +- - sys-kernel/dracut/dracut-049-r3.ebuild | 2 +- - sys-kernel/gentoo-kernel/Manifest | 2 + - .../gentoo-kernel/gentoo-kernel-5.4.15.ebuild | 81 +++++++++++ - sys-kernel/vanilla-kernel/Manifest | 1 + - .../vanilla-kernel/vanilla-kernel-5.4.15.ebuild | 73 ++++++++++ - sys-process/gnome-usage/gnome-usage-3.32.0.ebuild | 2 +- - www-client/epiphany/epiphany-3.32.6.ebuild | 2 +- - www-client/vivaldi/Manifest | 1 + - www-client/vivaldi/vivaldi-2.10.1745.30_p1.ebuild | 121 +++++++++++++++++ - x11-libs/gtk+/gtk+-3.24.13.ebuild | 2 +- - 75 files changed, 493 insertions(+), 427 deletions(-) - delete mode 100644 dev-python/carbon/carbon-0.9.13-r1.ebuild - delete mode 100644 dev-python/carbon/carbon-0.9.13.ebuild - delete mode 100644 dev-python/carbon/files/carbon-0.9.12-no-data-files.patch - delete mode 100644 dev-python/carbon/files/no-data-files.patch - delete mode 100644 dev-python/nevow/nevow-0.11.1.ebuild - delete mode 100644 dev-util/buildbot/buildbot-0.8.12-r3.ebuild - create mode 100644 net-ftp/ncftp/files/ncftp-3.2.6-fno-common.patch - create mode 100644 net-ftp/ncftp/ncftp-3.2.6-r1.ebuild - create mode 100644 sys-kernel/gentoo-kernel/gentoo-kernel-5.4.15.ebuild - create mode 100644 sys-kernel/vanilla-kernel/vanilla-kernel-5.4.15.ebuild - create mode 100644 www-client/vivaldi/vivaldi-2.10.1745.30_p1.ebuild + 266410b6f40..28891183cc5 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: 16% (15577/92305)
Updating files: 17% (15692/92305)
Updating files: 18% (16615/92305)
Updating files: 19% (17538/92305)
Updating files: 20% (18461/92305)
Updating files: 21% (19385/92305)
Updating files: 22% (20308/92305)
Updating files: 23% (21231/92305)
Updating files: 24% (22154/92305)
Updating files: 25% (23077/92305)
Updating files: 26% (24000/92305)
Updating files: 27% (24923/92305)
Updating files: 28% (25846/92305)
Updating files: 29% (26769/92305)
Updating files: 30% (27692/92305)
Updating files: 31% (28615/92305)
Updating files: 32% (29538/92305)
Updating files: 33% (30461/92305)
Updating files: 34% (31384/92305)
Updating files: 34% (31617/92305)
Updating files: 35% (32307/92305)
Updating files: 36% (33230/92305)
Updating files: 37% (34153/92305)
Updating files: 38% (35076/92305)
Updating files: 39% (35999/92305)
Updating files: 40% (36922/92305)
Updating files: 41% (37846/92305)
Updating files: 42% (38769/92305)
Updating files: 43% (39692/92305)
Updating files: 44% (40615/92305)
Updating files: 45% (41538/92305)
Updating files: 46% (42461/92305)
Updating files: 47% (43384/92305)
Updating files: 48% (44307/92305)
Updating files: 49% (45230/92305)
Updating files: 50% (46153/92305)
Updating files: 51% (47076/92305)
Updating files: 51% (47257/92305)
Updating files: 52% (47999/92305)
Updating files: 53% (48922/92305)
Updating files: 54% (49845/92305)
Updating files: 55% (50768/92305)
Updating files: 56% (51691/92305)
Updating files: 57% (52614/92305)
Updating files: 58% (53537/92305)
Updating files: 59% (54460/92305)
Updating files: 60% (55383/92305)
Updating files: 61% (56307/92305)
Updating files: 62% (57230/92305)
Updating files: 63% (58153/92305)
Updating files: 64% (59076/92305)
Updating files: 65% (59999/92305)
Updating files: 66% (60922/92305)
Updating files: 67% (61845/92305)
Updating files: 67% (62438/92305)
Updating files: 68% (62768/92305)
Updating files: 69% (63691/92305)
Updating files: 70% (64614/92305)
Updating files: 71% (65537/92305)
Updating files: 72% (66460/92305)
Updating files: 73% (67383/92305)
Updating files: 74% (68306/92305)
Updating files: 75% (69229/92305)
Updating files: 76% (70152/92305)
Updating files: 77% (71075/92305)
Updating files: 78% (71998/92305)
Updating files: 79% (72921/92305)
Updating files: 80% (73844/92305)
Updating files: 80% (74580/92305)
Updating files: 81% (74768/92305)
Updating files: 82% (75691/92305)
Updating files: 83% (76614/92305)
Updating files: 84% (77537/92305)
Updating files: 85% (78460/92305)
Updating files: 86% (79383/92305)
Updating files: 87% (80306/92305)
Updating files: 88% (81229/92305)
Updating files: 89% (82152/92305)
Updating files: 90% (83075/92305)
Updating files: 91% (83998/92305)
Updating files: 92% (84921/92305)
Updating files: 93% (85844/92305)
Updating files: 94% (86767/92305)
Updating files: 95% (87690/92305)
Updating files: 96% (88613/92305)
Updating files: 97% (89536/92305)
Updating files: 98% (90459/92305)
Updating files: 98% (90616/92305)
Updating files: 99% (91382/92305)
Updating files: 100% (92305/92305)
Updating files: 100% (92305/92305), 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 |