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
|
{'description': {'en': 'GURU: Ebuild repository entirely maintained by Gentoo '
'users'},
'feed': ['https://cgit.gentoo.org/repo/proj/guru.git/atom/'],
'homepage': 'https://wiki.gentoo.org/wiki/Project:GURU',
'name': 'guru',
'owner': [{'email': 'guru@gentoo.org', 'name': 'GURU', 'type': 'project'}],
'quality': 'experimental',
'source': [{'type': 'git',
'uri': 'https://anongit.gentoo.org/git/repo/proj/guru.git'},
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/proj/guru.git'}],
'status': 'unofficial'}
$ pmaint sync guru
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/proj/guru
027a009..2dc7c44 master -> origin/master
2c3715c..2dc7c44 dev -> origin/dev
Updating 027a009..2dc7c44
Fast-forward
app-emacs/vterm/Manifest | 1 -
app-emacs/vterm/files/50vterm-gentoo.el | 2 -
app-emacs/vterm/files/bashrc | 26 -------
app-emacs/vterm/files/config.fish | 30 --------
app-emacs/vterm/files/zshrc | 25 -------
app-emacs/vterm/metadata.xml | 26 -------
app-emacs/vterm/vterm-20200504.544-r1.ebuild | 63 ----------------
app-emacs/vterm/vterm-20200504.544.ebuild | 60 ----------------
app-misc/fetsh/Manifest | 1 +
app-misc/fetsh/fetsh-1.6.ebuild | 26 +++++++
app-misc/mobile-datovka/Manifest | 2 +-
...1.9.1-0001-add-metainfo-for-distributions.patch | 83 ----------------------
...9.1-0002-Support-Linux-phones-and-desktop.patch | 68 ------------------
...a-1.9.1.ebuild => mobile-datovka-1.10.0.ebuild} | 5 --
app-portage/version/Manifest | 1 +
app-portage/version/version-0.14.2_alpha.ebuild | 34 +++++++++
dev-libs/octetos-biblion/Manifest | 1 +
dev-libs/octetos-biblion/metadata.xml | 8 +++
.../octetos-biblion-0.1.1_alpha.ebuild | 31 ++++++++
.../octetos-core/octetos-core-2.3.2_beta.ebuild | 4 +-
.../octetos-core/octetos-core-2.3.3_beta.ebuild | 4 +-
sci-electronics/verilator/Manifest | 4 +-
.../files/verilator-4.034-fix-bison.patch | 30 ++++----
.../files/verilator-4.040-fix-bison.patch | 19 +++++
sci-electronics/verilator/verilator-4.032.ebuild | 49 +++++++++++++
sci-electronics/verilator/verilator-4.034.ebuild | 2 +
sci-electronics/verilator/verilator-4.036.ebuild | 4 +-
sci-electronics/verilator/verilator-4.038.ebuild | 4 +-
sci-electronics/verilator/verilator-4.040.ebuild | 47 ++++++++++++
sys-apps/flatpak/Manifest | 2 +-
.../{flatpak-1.8.1.ebuild => flatpak-1.8.2.ebuild} | 0
31 files changed, 245 insertions(+), 417 deletions(-)
delete mode 100644 app-emacs/vterm/Manifest
delete mode 100644 app-emacs/vterm/files/50vterm-gentoo.el
delete mode 100644 app-emacs/vterm/files/bashrc
delete mode 100644 app-emacs/vterm/files/config.fish
delete mode 100644 app-emacs/vterm/files/zshrc
delete mode 100644 app-emacs/vterm/metadata.xml
delete mode 100644 app-emacs/vterm/vterm-20200504.544-r1.ebuild
delete mode 100644 app-emacs/vterm/vterm-20200504.544.ebuild
create mode 100644 app-misc/fetsh/fetsh-1.6.ebuild
delete mode 100644 app-misc/mobile-datovka/files/mobile-datovka-1.9.1-0001-add-metainfo-for-distributions.patch
delete mode 100644 app-misc/mobile-datovka/files/mobile-datovka-1.9.1-0002-Support-Linux-phones-and-desktop.patch
rename app-misc/mobile-datovka/{mobile-datovka-1.9.1.ebuild => mobile-datovka-1.10.0.ebuild} (88%)
create mode 100644 app-portage/version/version-0.14.2_alpha.ebuild
create mode 100644 dev-libs/octetos-biblion/Manifest
create mode 100644 dev-libs/octetos-biblion/metadata.xml
create mode 100644 dev-libs/octetos-biblion/octetos-biblion-0.1.1_alpha.ebuild
create mode 100644 sci-electronics/verilator/files/verilator-4.040-fix-bison.patch
create mode 100644 sci-electronics/verilator/verilator-4.032.ebuild
create mode 100644 sci-electronics/verilator/verilator-4.040.ebuild
rename sys-apps/flatpak/{flatpak-1.8.1.ebuild => flatpak-1.8.2.ebuild} (100%)
*** syncing guru
*** synced guru
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 guru
* Cache regenerated successfully
|