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
|
{'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
400e42fab7f..0ae54e43948 master -> origin/master
Updating 400e42fab7f..0ae54e43948
Fast-forward
.../irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch | 38 +++++
net-irc/irssi/irssi-1.2.2-r1.ebuild | 67 ++++++++
net-proxy/haproxy/Manifest | 8 +-
net-proxy/haproxy/haproxy-1.8.25-r1.ebuild | 169 -------------------
...haproxy-2.0.15.ebuild => haproxy-2.0.18.ebuild} | 0
...{haproxy-2.0.16.ebuild => haproxy-2.1.9.ebuild} | 0
net-proxy/haproxy/haproxy-2.2.1.ebuild | 180 ---------------------
.../{haproxy-2.1.7.ebuild => haproxy-2.2.4.ebuild} | 0
8 files changed, 108 insertions(+), 354 deletions(-)
create mode 100644 net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch
create mode 100644 net-irc/irssi/irssi-1.2.2-r1.ebuild
delete mode 100644 net-proxy/haproxy/haproxy-1.8.25-r1.ebuild
rename net-proxy/haproxy/{haproxy-2.0.15.ebuild => haproxy-2.0.18.ebuild} (100%)
rename net-proxy/haproxy/{haproxy-2.0.16.ebuild => haproxy-2.1.9.ebuild} (100%)
delete mode 100644 net-proxy/haproxy/haproxy-2.2.1.ebuild
rename net-proxy/haproxy/{haproxy-2.1.7.ebuild => haproxy-2.2.4.ebuild} (100%)
*** 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
|
GitWeb
