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
|
{'description': {'en': "mva's sandbox overlay"},
'feed': ['https://github.com/msva/mva-overlay/commits/master.atom'],
'homepage': 'https://github.com/msva/mva-overlay/',
'name': 'mva',
'owner': [{'email': 'mva@gentoo.org',
'name': 'Vadim A. Misbakh-Soloviov',
'type': 'person'}],
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/msva/mva-overlay'},
{'type': 'git', 'uri': 'git://github.com/msva/mva-overlay'}],
'status': 'unofficial'}
$ pmaint sync mva
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://github.com/msva/mva-overlay
20f6d935..88a3abdf master -> origin/master
Updating 20f6d935..88a3abdf
Fast-forward
app-vim/nginx-syntax/Manifest | 2 +-
...ax-1.19.3.ebuild => nginx-syntax-1.19.4.ebuild} | 0
.../telegram-desktop-2.1.13.ebuild | 302 ---------------------
www-servers/nginx-unit/Manifest | 2 +-
...4.0-r10.ebuild => nginx-unit-1.20.0-r10.ebuild} | 0
www-servers/nginx/Manifest | 11 +-
.../conditional/busy-upstream/upstream-busy.patch | 0
.../upstream-check-plus-stream.patch | 0
.../conditional/ssl-cert-cb/cert-callbacks.patch | 0
.../fix-perl-install-path.patch | 0
.../httpoxy-mitigation-r1.patch | 0
...x-1.19.3-r10.ebuild => nginx-1.19.4-r10.ebuild} | 8 +-
12 files changed, 11 insertions(+), 314 deletions(-)
rename app-vim/nginx-syntax/{nginx-syntax-1.19.3.ebuild => nginx-syntax-1.19.4.ebuild} (100%)
delete mode 100644 net-im/telegram-desktop/telegram-desktop-2.1.13.ebuild
rename www-servers/nginx-unit/{nginx-unit-1.14.0-r10.ebuild => nginx-unit-1.20.0-r10.ebuild} (100%)
rename www-servers/nginx/files/patches/{1.19.3 => mainline}/conditional/busy-upstream/upstream-busy.patch (100%)
rename www-servers/nginx/files/patches/{1.19.3 => mainline}/conditional/nginx_modules_http_upstream_check/upstream-check-plus-stream.patch (100%)
rename www-servers/nginx/files/patches/{1.19.3 => mainline}/conditional/ssl-cert-cb/cert-callbacks.patch (100%)
rename www-servers/nginx/files/patches/{1.19.3 => mainline}/fix-perl-install-path.patch (100%)
rename www-servers/nginx/files/patches/{1.19.3 => mainline}/httpoxy-mitigation-r1.patch (100%)
rename www-servers/nginx/{nginx-1.19.3-r10.ebuild => nginx-1.19.4-r10.ebuild} (99%)
*** syncing mva
*** synced mva
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mva
* app-backup/lvmsync-9999: failed parsing REQUIRED_USE: '|| ( )' is unparseable
* Cache regen failed with 1
|
GitWeb
