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
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
|
{'description': {'en': 'Calculate Overlay'},
'homepage': 'http://www.calculate-linux.org',
'name': 'calculate',
'owner': [{'email': 'at@calculate.ru', 'type': 'person'}],
'quality': 'experimental',
'source': [{'type': 'git',
'uri': 'git://git.calculate-linux.org/calculate/calculate-overlay.git'}],
'status': 'unofficial'}
$ pmaint sync calculate
*** syncing calculate
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 git://git.calculate-linux.org/calculate/calculate-overlay
35e9bae67..7298f8c78 master -> origin/master
7bb5741bc..7298f8c78 develop -> origin/develop
35e9bae67..7298f8c78 master64 -> origin/master64
7bb5741bc..7298f8c78 mhiretskiy -> origin/mhiretskiy
7bb5741bc..7298f8c78 update -> origin/update
* [new tag] 2446 -> 2446
Updating 35e9bae67..7298f8c78
Fast-forward
.../app-text/evince/mimeapps.list | 7 +
.../www-client/firefox/firefox-wayland.desktop | 6 +
.../www-client/firefox/firefox-x11.desktop | 6 +
.../100-Browser/10-firefox/install/mimeapps.list | 14 ++
.../100-Browser/20-chromium/install/mimeapps.list | 14 ++
.../100-Browser/30-qupzilla/install/mimeapps.list | 14 ++
.../100-Browser/40-opera/install/mimeapps.list | 14 ++
.../100-Browser/50-epiphany/install/mimeapps.list | 14 ++
.../60-qutebrowser/install/mimeapps.list | 14 ++
.../zzz-Desktop/100-Browser/mimeapps.list | 14 ++
.../110-Mail/10-kmail/install/mimeapps.list | 3 +
.../110-Mail/20-evolution/install/mimeapps.list | 5 +-
.../110-Mail/30-claws-mail/install/mimeapps.list | 3 +
.../110-Mail/40-trojita/install/mimeapps.list | 3 +
.../zzz-Desktop/110-Mail/mimeapps.list | 3 +
.../10-libreoffice/install/mimeapps.list | 4 +
.../15-libreoffice-bin/install/mimeapps.list | 4 +
.../zzz-Desktop/200-Writer/mimeapps.list | 4 +
.../210-Calc/10-libreoffice/install/mimeapps.list | 5 +-
.../15-libreoffice-bin/install/mimeapps.list | 5 +-
.../zzz-Desktop/210-Calc/mimeapps.list | 3 +
.../300-ImageEdit/10-gimp/install/mimeapps.list | 3 +
.../zzz-Desktop/300-ImageEdit/mimeapps.list | 3 +
.../10-gwenview/install/mimeapps.list | 62 ++++---
.../320-ImageView/20-eom/install/mimeapps.list | 22 +++
.../320-ImageView/30-eog/install/eog-2.30.desktop | 2 +-
.../320-ImageView/30-eog/install/mimeapps.list | 62 ++++---
.../320-ImageView/40-nomacs/install/mimeapps.list | 62 ++++---
.../40-nomacs/install/nomacs-1.6.desktop | 6 -
.../40-nomacs/install/nomacs-3.16.desktop | 6 +
.../320-ImageView/50-geeqie/install/mimeapps.list | 22 +++
.../60-lximage-qt/install/mimeapps.list | 22 +++
.../320-ImageView/70-mirage/install/mimeapps.list | 22 +++
.../zzz-Desktop/320-ImageView/mimeapps.list | 22 +++
.../10-amarok/install/mimeapps.list | 7 +
.../20-clementine/install/mimeapps.list | 7 +
.../30-audacious/install/mimeapps.list | 7 +
.../40-rhythmbox/install/mimeapps.list | 7 +
.../zzz-Desktop/400-AudioPlayer/mimeapps.list | 7 +
.../500-VideoPlayer/10-totem/install/mimeapps.list | 29 +++-
.../20-smplayer/install/mimeapps.list | 11 ++
.../30-gnome-mplayer/install/mimeapps.list | 11 ++
.../zzz-Desktop/500-VideoPlayer/mimeapps.list | 11 ++
.../600-ImageBurn/10-k3b/install/mimeapps.list | 3 +
.../600-ImageBurn/20-brasero/install/mimeapps.list | 3 +
.../600-ImageBurn/30-xfburn/install/mimeapps.list | 3 +
.../zzz-Desktop/600-ImageBurn/mimeapps.list | 3 +
.../800-TextEdit/10-kwrite/install/mimeapps.list | 5 +-
.../800-TextEdit/20-gedit/install/mimeapps.list | 5 +-
.../800-TextEdit/30-pluma/install/mimeapps.list | 3 +
.../800-TextEdit/40-leafpad/install/mimeapps.list | 3 +
.../50-featherpad/install/mimeapps.list | 3 +
.../zzz-Desktop/800-TextEdit/mimeapps.list | 3 +
.../900-Terminal/10-konsole/install/mimeapps.list | 1 -
.../20-gnome-terminal/install/mimeapps.list | 1 -
.../30-mate-terminal/install/mimeapps.list | 1 -
.../40-xfce4-terminal/install/mimeapps.list | 1 -
.../50-qterminal/install/mimeapps.list | 1 -
.../zzz-Desktop/900-Terminal/mimeapps.list | 1 -
.../zzz-Desktop/999-PDFReader/10-qpdfview/install | 3 +
.../zzz-Desktop/999-PDFReader/mimeapps.list | 3 +
.../3.6/6_ac_update_sync/remerge/2021/20210426 | 4 +
.../calculate-server-2.1.20-r3.ebuild | 193 +++++++++++++++++++++
.../files/calculate-server-2.1.20-fix_pam.patch | 25 +++
64 files changed, 753 insertions(+), 87 deletions(-)
create mode 100644 profiles/templates/3.6/2_ac_install_merge/app-text/evince/mimeapps.list
create mode 100644 profiles/templates/3.6/2_ac_install_merge/www-client/firefox/firefox-wayland.desktop
create mode 100644 profiles/templates/3.6/2_ac_install_merge/www-client/firefox/firefox-x11.desktop
delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/nomacs-1.6.desktop
create mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/nomacs-3.16.desktop
create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210426
create mode 100644 sys-apps/calculate-server/calculate-server-2.1.20-r3.ebuild
create mode 100644 sys-apps/calculate-server/files/calculate-server-2.1.20-fix_pam.patch
*** synced calculate
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 calculate
* Cache regenerated successfully
|
GitWeb