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
|
{'description': {'en': 'Overlay for scientific software and other utilities'},
'feed': ['https://github.com/TheChymera/overlay/commits/master.atom'],
'homepage': 'https://github.com/TheChymera/overlay',
'name': 'chymeric',
'owner': [{'email': 'chr@chymera.eu',
'name': 'Horea Christian',
'type': 'person'}],
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/TheChymera/overlay.git'},
{'type': 'git', 'uri': 'git://github.com/TheChymera/overlay.git'},
{'type': 'git',
'uri': 'git+ssh://git@github.com/TheChymera/overlay.git'}],
'status': 'unofficial'}
$ pmaint sync chymeric
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/TheChymera/overlay
cb4d873..5a99fee master -> origin/master
Updating cb4d873..5a99fee
Fast-forward
dev-python/seaborn/ChangeLog | 3 ++
dev-python/seaborn/seaborn-0.10.1.ebuild | 2 +-
sci-biology/psychopy/Manifest | 1 -
sci-biology/psychopy/metadata.xml | 11 -----
sci-biology/psychopy/psychopy-3.0.7.ebuild | 71 ------------------------------
sci-biology/samri/ChangeLog | 3 ++
sci-biology/samri/samri-0.4.2.ebuild | 2 +-
sci-biology/samri/samri-9999.ebuild | 4 +-
sci-libs/cosgen/ChangeLog | 31 +------------
sci-libs/cosgen/cosgen-9999.ebuild | 4 +-
10 files changed, 14 insertions(+), 118 deletions(-)
delete mode 100644 sci-biology/psychopy/Manifest
delete mode 100644 sci-biology/psychopy/metadata.xml
delete mode 100644 sci-biology/psychopy/psychopy-3.0.7.ebuild
*** syncing chymeric
*** synced chymeric
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 chymeric
* Cache regenerated successfully
|
GitWeb
