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
|
{'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
19b88534226..d675113d42a master -> origin/master
Updating 19b88534226..d675113d42a
Fast-forward
dev-python/python-nbxmpp/Manifest | 1 +
.../python-nbxmpp/python-nbxmpp-1.0.2.ebuild | 17 +++++
.../cmt-plugins/cmt-plugins-1.17-r1.ebuild | 1 +
.../cmt-plugins/files/cmt-plugins-1.17-clang.patch | 13 ++++
.../files/cmt-plugins-1.17-makefile.patch | 2 +-
net-im/gajim/Manifest | 3 +-
net-im/gajim/gajim-1.1.3-r1.ebuild | 88 ----------------------
net-im/gajim/gajim-1.1.3-r2.ebuild | 83 --------------------
.../{gajim-1.2.0.ebuild => gajim-1.2.2.ebuild} | 6 +-
net-im/gajim/metadata.xml | 1 -
profiles/arch/riscv/package.use.mask | 3 +-
11 files changed, 40 insertions(+), 178 deletions(-)
create mode 100644 dev-python/python-nbxmpp/python-nbxmpp-1.0.2.ebuild
create mode 100644 media-plugins/cmt-plugins/files/cmt-plugins-1.17-clang.patch
delete mode 100644 net-im/gajim/gajim-1.1.3-r1.ebuild
delete mode 100644 net-im/gajim/gajim-1.1.3-r2.ebuild
rename net-im/gajim/{gajim-1.2.0.ebuild => gajim-1.2.2.ebuild} (93%)
*** 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
