summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt105
1 files changed, 15 insertions, 90 deletions
diff --git a/gentoo.txt b/gentoo.txt
index d6d9755f9fad..1ec031a377c6 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -16,97 +16,22 @@ pkgcore 0.12.24
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
*** syncing gentoo
From https://github.com/gentoo/gentoo
- 08c656dbe110..77611a184d50 master -> origin/master
-Updating 08c656dbe110..77611a184d50
-Fast-forward
- .../megaglest/megaglest-3.13.0-r1.ebuild | 173 --------------
- games-strategy/megaglest/megaglest-3.13.0.ebuild | 144 ------------
- games-strategy/scorched3d/scorched3d-44-r2.ebuild | 91 --------
- games-util/dfarc/dfarc-3.14.ebuild | 38 ---
- .../wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild | 30 ---
- media-gfx/superslicer/Manifest | 2 -
- ....0-boost-1.81-std-wxString-to-std-wstring.patch | 40 ----
- .../files/superslicer-2.5.59.0-boost.patch | 256 ---------------------
- .../files/superslicer-2.5.59.0-cereal.patch | 53 -----
- ...2.5.59.0-dont-install-bundled-angelscript.patch | 53 -----
- ...erslicer-2.5.59.0-fix-gcodeviewer-symlink.patch | 11 -
- .../superslicer-2.5.59.0-missing-includes.patch | 36 ---
- .../files/superslicer-2.5.59.0-openexr3.patch | 77 -------
- .../superslicer-2.5.59.0-wxgtk3-wayland.patch | 21 --
- .../superslicer/superslicer-2.5.59.0-r3.ebuild | 102 --------
- media-gfx/tintii/tintii-2.10.0-r1.ebuild | 28 ---
- media-sound/spek/spek-0.8.5.ebuild | 35 ---
- media-video/aegisub/Manifest | 1 -
- .../aegisub/aegisub-3.2.2_p20160518-r105.ebuild | 161 -------------
- media-video/dvdstyler/dvdstyler-3.2.1.ebuild | 70 ------
- media-video/mediainfo/Manifest | 3 -
- media-video/mediainfo/mediainfo-22.09.ebuild | 89 -------
- media-video/mediainfo/mediainfo-23.03.ebuild | 92 --------
- media-video/mediainfo/mediainfo-23.04.ebuild | 92 --------
- net-p2p/amule/amule-2.3.3-r2.ebuild | 159 -------------
- net-wireless/limesuite/Manifest | 2 -
- net-wireless/limesuite/limesuite-20.10.0.ebuild | 34 ---
- net-wireless/limesuite/limesuite-23.10.0.ebuild | 34 ---
- sci-biology/treeviewx/Manifest | 1 -
- .../files/treeviewx-0.5.1-70_choose_tree.patch | 11 -
- .../files/treeviewx-0.5.1-fix_loading_crash.patch | 40 ----
- .../treeviewx/files/treeviewx-0.5.1-gcc4.3.patch | 77 -------
- .../treeviewx/files/treeviewx-0.5.1-svg.patch | 30 ---
- .../treeviewx-0.5.1-treeview-xpm-not-xbm.patch | 16 --
- .../treeviewx/files/treeviewx-0.5.1-wx30.patch | 66 ------
- .../files/treeviewx-0.5.1-wxstring-maxlen.patch | 34 ---
- sci-biology/treeviewx/files/treeviewx-wxt.patch | 50 ----
- sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild | 42 ----
- sci-chemistry/wxmacmolplt/Manifest | 1 -
- .../wxmacmolplt/files/wxmacmolplt-7.5-glew.patch | 11 -
- .../wxmacmolplt/wxmacmolplt-7.5-r1.ebuild | 48 ----
- sci-electronics/gspiceui/Manifest | 2 +-
- .../gspiceui/files/gspiceui-1.1.0-flags.patch | 26 ---
- ...ui-1.3.30_pre20240321-respect-users-flags.patch | 50 ++++
- sci-electronics/gspiceui/gspiceui-1.1.0.ebuild | 85 -------
- ...1.ebuild => gspiceui-1.3.30_pre20240321.ebuild} | 27 +--
- 46 files changed, 62 insertions(+), 2482 deletions(-)
- delete mode 100644 games-strategy/megaglest/megaglest-3.13.0-r1.ebuild
- delete mode 100644 games-strategy/megaglest/megaglest-3.13.0.ebuild
- delete mode 100644 games-strategy/scorched3d/scorched3d-44-r2.ebuild
- delete mode 100644 games-util/dfarc/dfarc-3.14.ebuild
- delete mode 100644 games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild
- delete mode 100644 media-gfx/superslicer/files/superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch
- delete mode 100644 media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch
- delete mode 100644 media-gfx/superslicer/files/superslicer-2.5.59.0-cereal.patch
- delete mode 100644 media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch
- delete mode 100644 media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch
- delete mode 100644 media-gfx/superslicer/files/superslicer-2.5.59.0-missing-includes.patch
- delete mode 100644 media-gfx/superslicer/files/superslicer-2.5.59.0-openexr3.patch
- delete mode 100644 media-gfx/superslicer/files/superslicer-2.5.59.0-wxgtk3-wayland.patch
- delete mode 100644 media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild
- delete mode 100644 media-gfx/tintii/tintii-2.10.0-r1.ebuild
- delete mode 100644 media-sound/spek/spek-0.8.5.ebuild
- delete mode 100644 media-video/aegisub/aegisub-3.2.2_p20160518-r105.ebuild
- delete mode 100644 media-video/dvdstyler/dvdstyler-3.2.1.ebuild
- delete mode 100644 media-video/mediainfo/mediainfo-22.09.ebuild
- delete mode 100644 media-video/mediainfo/mediainfo-23.03.ebuild
- delete mode 100644 media-video/mediainfo/mediainfo-23.04.ebuild
- delete mode 100644 net-p2p/amule/amule-2.3.3-r2.ebuild
- delete mode 100644 net-wireless/limesuite/limesuite-20.10.0.ebuild
- delete mode 100644 net-wireless/limesuite/limesuite-23.10.0.ebuild
- delete mode 100644 sci-biology/treeviewx/files/treeviewx-0.5.1-70_choose_tree.patch
- delete mode 100644 sci-biology/treeviewx/files/treeviewx-0.5.1-fix_loading_crash.patch
- delete mode 100644 sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch
- delete mode 100644 sci-biology/treeviewx/files/treeviewx-0.5.1-svg.patch
- delete mode 100644 sci-biology/treeviewx/files/treeviewx-0.5.1-treeview-xpm-not-xbm.patch
- delete mode 100644 sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch
- delete mode 100644 sci-biology/treeviewx/files/treeviewx-0.5.1-wxstring-maxlen.patch
- delete mode 100644 sci-biology/treeviewx/files/treeviewx-wxt.patch
- delete mode 100644 sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
- delete mode 100644 sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.5-glew.patch
- delete mode 100644 sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild
- delete mode 100644 sci-electronics/gspiceui/files/gspiceui-1.1.0-flags.patch
- create mode 100644 sci-electronics/gspiceui/files/gspiceui-1.3.30_pre20240321-respect-users-flags.patch
- delete mode 100644 sci-electronics/gspiceui/gspiceui-1.1.0.ebuild
- rename sci-electronics/gspiceui/{gspiceui-1.2.87-r1.ebuild => gspiceui-1.3.30_pre20240321.ebuild} (74%)
+ 77611a184d50..9b9a00897572 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>
+
+!!! failed syncing gentoo
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
+*** syncing gentoo
+Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
+Updating files: 23% (20524/89102) Updating files: 24% (21385/89102) Updating files: 25% (22276/89102) Updating files: 26% (23167/89102) Updating files: 27% (24058/89102) Updating files: 28% (24949/89102) Updating files: 29% (25840/89102) Updating files: 30% (26731/89102) Updating files: 31% (27622/89102) Updating files: 32% (28513/89102) Updating files: 33% (29404/89102) Updating files: 34% (30295/89102) Updating files: 35% (31186/89102) Updating files: 36% (32077/89102) Updating files: 37% (32968/89102) Updating files: 38% (33859/89102) Updating files: 39% (34750/89102) Updating files: 40% (35641/89102) Updating files: 41% (36532/89102) Updating files: 42% (37423/89102) Updating files: 43% (38314/89102) Updating files: 44% (39205/89102) Updating files: 45% (40096/89102) Updating files: 46% (40987/89102) Updating files: 47% (41878/89102) Updating files: 47% (42037/89102) Updating files: 48% (42769/89102) Updating files: 49% (43660/89102) Updating files: 50% (44551/89102) Updating files: 51% (45443/89102) Updating files: 52% (46334/89102) Updating files: 53% (47225/89102) Updating files: 54% (48116/89102) Updating files: 55% (49007/89102) Updating files: 56% (49898/89102) Updating files: 57% (50789/89102) Updating files: 58% (51680/89102) Updating files: 59% (52571/89102) Updating files: 60% (53462/89102) Updating files: 61% (54353/89102) Updating files: 62% (55244/89102) Updating files: 63% (56135/89102) Updating files: 64% (57026/89102) Updating files: 65% (57917/89102) Updating files: 66% (58808/89102) Updating files: 67% (59699/89102) Updating files: 68% (60590/89102) Updating files: 69% (61481/89102) Updating files: 69% (61799/89102) Updating files: 70% (62372/89102) Updating files: 71% (63263/89102) Updating files: 72% (64154/89102) Updating files: 73% (65045/89102) Updating files: 74% (65936/89102) Updating files: 75% (66827/89102) Updating files: 76% (67718/89102) Updating files: 77% (68609/89102) Updating files: 78% (69500/89102) Updating files: 79% (70391/89102) Updating files: 80% (71282/89102) Updating files: 81% (72173/89102) Updating files: 82% (73064/89102) Updating files: 83% (73955/89102) Updating files: 84% (74846/89102) Updating files: 85% (75737/89102) Updating files: 86% (76628/89102) Updating files: 87% (77519/89102) Updating files: 88% (78410/89102) Updating files: 89% (79301/89102) Updating files: 90% (80192/89102) Updating files: 91% (81083/89102) Updating files: 92% (81974/89102) Updating files: 93% (82865/89102) Updating files: 93% (83527/89102) Updating files: 94% (83756/89102) Updating files: 95% (84647/89102) Updating files: 96% (85538/89102) Updating files: 97% (86429/89102) Updating files: 98% (87320/89102) Updating files: 99% (88211/89102) Updating files: 100% (89102/89102) Updating files: 100% (89102/89102), done.
*** synced gentoo
- * Sync succeeded
+ * Sync succeeded after re-adding
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gentoo