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
|
{'description': {'en': "misc ebuilds that aren't in the main tree"},
'homepage': 'https://cgit.gentoo.org/user/haarp.git/',
'name': 'haarp',
'owner': [{'email': 'main.haarp@gmail.com',
'name': 'haarp',
'type': 'person'}],
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'git://anongit.gentoo.org/user/haarp.git'}],
'status': 'unofficial'}
$ pmaint sync haarp
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://anongit.gentoo.org/user/haarp
2096c1c..ee5556a master -> origin/master
Updating 2096c1c..ee5556a
Fast-forward
app-editors/xed/Manifest | 4 +-
.../xed/{xed-2.6.0.ebuild => xed-2.8.4.ebuild} | 4 +-
sci-mathematics/cgal/Manifest | 4 -
sci-mathematics/cgal/cgal-4.14.3.ebuild | 75 ------------------
sci-mathematics/cgal/metadata.xml | 24 ------
x11-libs/xapps/Manifest | 3 +
x11-libs/xapps/metadata.xml | 19 +++++
x11-libs/xapps/xapps-2.0.0.ebuild | 89 ++++++++++++++++++++++
x11-misc/gesture-manager-x/Manifest | 1 +
.../gesture-manager-x-9999.ebuild | 36 +++++++++
x11-misc/gestures/Manifest | 2 -
x11-misc/gestures/gestures-0.2.2.ebuild | 19 -----
12 files changed, 152 insertions(+), 128 deletions(-)
rename app-editors/xed/{xed-2.6.0.ebuild => xed-2.8.4.ebuild} (96%)
delete mode 100644 sci-mathematics/cgal/Manifest
delete mode 100644 sci-mathematics/cgal/cgal-4.14.3.ebuild
delete mode 100644 sci-mathematics/cgal/metadata.xml
create mode 100644 x11-libs/xapps/Manifest
create mode 100644 x11-libs/xapps/metadata.xml
create mode 100644 x11-libs/xapps/xapps-2.0.0.ebuild
create mode 100644 x11-misc/gesture-manager-x/Manifest
create mode 100644 x11-misc/gesture-manager-x/gesture-manager-x-9999.ebuild
delete mode 100644 x11-misc/gestures/Manifest
delete mode 100644 x11-misc/gestures/gestures-0.2.2.ebuild
*** syncing haarp
*** synced haarp
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 haarp
* Cache regenerated successfully
|
GitWeb
