summaryrefslogtreecommitdiff
blob: b46bc2d04cfb75a5d7428721cbaf1b1d43df36bd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
{'description': {'en': 'Official Gentoo ebuild repository'},
 'feed': ['https://cgit.gentoo.org/repo/gentoo.git/atom/'],
 'homepage': 'https://gentoo.org/',
 'name': 'gentoo',
 'owner': [{'email': 'bug-wranglers@gentoo.org', 'type': 'project'}],
 'quality': 'core',
 'source': [{'type': 'rsync', 'uri': 'rsync://rsync.gentoo.org/gentoo-portage'},
            {'type': 'git',
             'uri': 'https://anongit.gentoo.org/git/repo/gentoo.git'},
            {'type': 'git', 'uri': 'git://anongit.gentoo.org/repo/gentoo.git'},
            {'type': 'git',
             'uri': 'git+ssh://git@git.gentoo.org/repo/gentoo.git'}],
 'status': 'official'}
$ pmaint sync gentoo
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
   1551f788867..26dc3c4ddc2  master     -> origin/master
Updating 1551f788867..26dc3c4ddc2
Fast-forward
 .../files/ansible-2.10.0-CVE-2020-25635-6.patch    |  54 -----
 app-doc/diveintopython/Manifest                    |   2 -
 app-doc/diveintopython/diveintopython-2.ebuild     |  31 ---
 app-misc/tmux-xpanes/Manifest                      |   1 +
 app-misc/tmux-xpanes/tmux-xpanes-4.1.2.ebuild      |  36 ++++
 games-fps/gzdoom/gzdoom-4.5.0.ebuild               |   9 +-
 net-misc/spiped/Manifest                           |   1 +
 net-misc/spiped/spiped-1.6.1.ebuild                |  54 +++++
 sys-apps/fwupd/fwupd-1.5.5.ebuild                  |   1 +
 x11-wm/xpra/Manifest                               |   3 +-
 x11-wm/xpra/files/xpra-3.0.2-dbus.patch            |  29 ---
 x11-wm/xpra/files/xpra-4.0.6-r28363.patch          | 238 +++++++++++++++++++++
 x11-wm/xpra/metadata.xml                           |   8 +-
 x11-wm/xpra/xpra-3.0.2-r1.ebuild                   | 144 -------------
 ...{xpra-4.0.4.ebuild => xpra-4.0.6_p28363.ebuild} |  85 +++++---
 15 files changed, 395 insertions(+), 301 deletions(-)
 delete mode 100644 app-admin/ansible/files/ansible-2.10.0-CVE-2020-25635-6.patch
 delete mode 100644 app-doc/diveintopython/diveintopython-2.ebuild
 create mode 100644 app-misc/tmux-xpanes/tmux-xpanes-4.1.2.ebuild
 create mode 100644 net-misc/spiped/spiped-1.6.1.ebuild
 delete mode 100644 x11-wm/xpra/files/xpra-3.0.2-dbus.patch
 create mode 100644 x11-wm/xpra/files/xpra-4.0.6-r28363.patch
 delete mode 100644 x11-wm/xpra/xpra-3.0.2-r1.ebuild
 rename x11-wm/xpra/{xpra-4.0.4.ebuild => xpra-4.0.6_p28363.ebuild} (62%)
*** syncing gentoo
*** synced gentoo
 * Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
 * Cache regenerated successfully