summaryrefslogtreecommitdiff
blob: 6ab1d2df18e9dd6267645b98d63fe56b74c77a8e (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
50
51
52
53
54
55
56
57
58
{'description': {'en': 'Official Gentoo ebuild repository'},
 'feed': ['https://cgit.gentoo.org/repo/gentoo.git/atom/'],
 'homepage': 'https://gentoo.org/',
 'name': 'gentoo',
 'owner': [{'email': 'bug-wranglers@gentoo.org', 'type': 'project'}],
 'quality': 'core',
 'source': [{'type': 'rsync', 'uri': 'rsync://rsync.gentoo.org/gentoo-portage'},
            {'type': 'git',
             'uri': 'https://anongit.gentoo.org/git/repo/gentoo.git'},
            {'type': 'git', 'uri': 'git://anongit.gentoo.org/repo/gentoo.git'},
            {'type': 'git',
             'uri': 'git+ssh://git@git.gentoo.org/repo/gentoo.git'}],
 'status': 'official'}
$ pmaint sync gentoo
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/gentoo
   9e5089ea1c1..09cd5f69594  master     -> origin/master
Updating 9e5089ea1c1..09cd5f69594
Fast-forward
 app-misc/birthday/birthday-1.6.2-r1.ebuild         |  8 ++--
 app-misc/ondir/Manifest                            |  1 -
 app-misc/ondir/ondir-0.2.2-r2.ebuild               | 45 ----------------------
 app-misc/ondir/ondir-0.2.4.ebuild                  |  2 +-
 app-misc/when/Manifest                             |  2 +-
 app-misc/when/when-1.1.37.ebuild                   |  4 +-
 .../{when-1.1.36.ebuild => when-1.1.40.ebuild}     |  8 ++--
 app-office/libreoffice/libreoffice-7.0.3.1.ebuild  |  2 +-
 app-office/libreoffice/libreoffice-7.0.9999.ebuild |  2 +-
 app-office/libreoffice/libreoffice-9999.ebuild     |  2 +-
 ...r1.ebuild => dymo-cups-drivers-1.4.0-r2.ebuild} | 11 +++---
 .../dymo-cups-drivers-1.4.0.ebuild                 | 39 -------------------
 .../files/cups-2.3.0-headers.patch                 | 24 ++++++++++++
 net-print/dymo-cups-drivers/metadata.xml           |  2 +-
 14 files changed, 47 insertions(+), 105 deletions(-)
 delete mode 100644 app-misc/ondir/ondir-0.2.2-r2.ebuild
 rename app-misc/when/{when-1.1.36.ebuild => when-1.1.40.ebuild} (85%)
 rename net-print/dymo-cups-drivers/{dymo-cups-drivers-1.4.0-r1.ebuild => dymo-cups-drivers-1.4.0-r2.ebuild} (89%)
 delete mode 100644 net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild
 create mode 100644 net-print/dymo-cups-drivers/files/cups-2.3.0-headers.patch
*** syncing gentoo
*** synced gentoo
 * Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
 * Cache regenerated successfully