summaryrefslogtreecommitdiff
blob: 12cb09c6280ca710b680d1186b47d95b8a172276 (plain)
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
{'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.ru/calculate/overlay.git'}],
 'status': 'unofficial'}
$ pmaint sync 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.ru/calculate/overlay
   35e89e4ce..76ade870d  master     -> origin/master
   35e89e4ce..76ade870d  master64   -> origin/master64
 * [new tag]             2189       -> 2189
Updating 35e89e4ce..76ade870d
Fast-forward
 .../3.6/2_ac_install_merge/net-fs/samba/samba      |   5 +
 .../profile.bashrc.d/50-server-distfiles           |  10 ++
 .../templates/3.6/6_ac_update_sync/remerge/0-ini   |   2 +-
 .../3.6/6_ac_update_sync/remerge/2020/20200821     |   4 +
 .../calculate-server-2.1.19-r14.ebuild             | 194 +++++++++++++++++++++
 .../calculate-server-2.1.19-fix_samba4.11.patch    | 134 ++++++++++++++
 sys-apps/calculate-utils/Manifest                  |   1 +
 .../calculate-utils/calculate-utils-3.6.8.3.ebuild |  22 +++
 8 files changed, 371 insertions(+), 1 deletion(-)
 create mode 100644 profiles/templates/3.6/2_ac_install_merge/net-fs/samba/samba
 create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2020/20200821
 create mode 100644 sys-apps/calculate-server/calculate-server-2.1.19-r14.ebuild
 create mode 100644 sys-apps/calculate-server/files/calculate-server-2.1.19-fix_samba4.11.patch
 create mode 100644 sys-apps/calculate-utils/calculate-utils-3.6.8.3.ebuild
*** syncing calculate
*** 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 1 calculate
 * Cache regenerated successfully