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
63
64
|
{'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
05ffdb8742d..04f2f864ba6 master -> origin/master
Updating 05ffdb8742d..04f2f864ba6
Fast-forward
app-misc/todo/metadata.xml | 2 +-
dev-lua/luaposix/luaposix-35.0.ebuild | 10 +-
dev-util/lcov/Manifest | 1 +
dev-util/lcov/lcov-1.15.ebuild | 44 +++
dev-util/lcov/lcov-9999.ebuild | 11 +-
gui-wm/hikari/Manifest | 3 +-
gui-wm/hikari/files/hikari-1.2.0-gnu-make.patch | 315 --------------------
gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch | 327 ---------------------
gui-wm/hikari/hikari-1.2.0.ebuild | 55 ----
gui-wm/hikari/hikari-2.0.2.ebuild | 63 ----
gui-wm/hikari/hikari-2.1.2.ebuild | 59 ++++
gui-wm/hikari/metadata.xml | 1 -
media-gfx/qiv/Manifest | 2 +-
media-gfx/qiv/metadata.xml | 3 -
.../qiv/{qiv-2.3.2.ebuild => qiv-2.3.2-r1.ebuild} | 14 +-
net-misc/batctl/Manifest | 2 +-
.../{batctl-2020.1.ebuild => batctl-2020.3.ebuild} | 0
17 files changed, 131 insertions(+), 781 deletions(-)
create mode 100644 dev-util/lcov/lcov-1.15.ebuild
delete mode 100644 gui-wm/hikari/files/hikari-1.2.0-gnu-make.patch
delete mode 100644 gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch
delete mode 100644 gui-wm/hikari/hikari-1.2.0.ebuild
delete mode 100644 gui-wm/hikari/hikari-2.0.2.ebuild
create mode 100644 gui-wm/hikari/hikari-2.1.2.ebuild
rename media-gfx/qiv/{qiv-2.3.2.ebuild => qiv-2.3.2-r1.ebuild} (77%)
rename net-misc/batctl/{batctl-2020.1.ebuild => batctl-2020.3.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
