summaryrefslogtreecommitdiff
blob: 823165cc1d1b7937c46fcedd63a4164fb100dc31 (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
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
{'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
   7a4c380e09d..a54f08e3a97  master     -> origin/master
Updating 7a4c380e09d..a54f08e3a97
Fast-forward
 app-admin/conky/conky-1.11.6-r1.ebuild             | 192 -------------------
 dev-python/owslib/Manifest                         |   1 -
 dev-python/owslib/owslib-0.17.1-r1.ebuild          |  39 ----
 dev-python/pyproj/Manifest                         |   1 -
 .../pyproj/files/pyproj-2.4.2-conftest.patch       |  31 ----
 dev-python/pyproj/pyproj-2.4.2-r1.ebuild           |  37 ----
 ...rk-5.15.1.ebuild => qtnetwork-5.15.1-r1.ebuild} |   3 +-
 kde-apps/kdav/Manifest                             |   1 -
 kde-apps/kdav/kdav-20.04.3.ebuild                  |  36 ----
 kde-apps/kdav/metadata.xml                         |   8 -
 kde-plasma/discover/discover-5.20.3.ebuild         |  78 --------
 profiles/package.mask                              |   4 -
 sci-geosciences/qgis/Manifest                      |   1 -
 .../qgis/files/qgis-3.10.0-cmake-lib-suffix.patch  |  12 --
 .../qgis/files/qgis-9999-default-qmldir.patch      |  25 +++
 .../qgis/files/qgis-9999-featuresummary.patch      |  31 ++++
 sci-geosciences/qgis/qgis-3.10.9.ebuild            | 203 ---------------------
 sci-geosciences/qgis/qgis-9999.ebuild              |   6 +-
 sys-boot/unetbootin/Manifest                       |   2 -
 .../unetbootin/files/unetbootin-581-desktop.patch  |  24 ---
 sys-boot/unetbootin/unetbootin-661.ebuild          |  99 ----------
 sys-kernel/gentoo-sources/Manifest                 |  18 ++
 .../gentoo-sources/gentoo-sources-4.14.207.ebuild  |  28 +++
 .../gentoo-sources/gentoo-sources-4.19.158.ebuild  |  28 +++
 .../gentoo-sources/gentoo-sources-4.4.244.ebuild   |  28 +++
 .../gentoo-sources/gentoo-sources-4.9.244.ebuild   |  28 +++
 .../gentoo-sources/gentoo-sources-5.4.78.ebuild    |  28 +++
 .../gentoo-sources/gentoo-sources-5.9.9.ebuild     |  29 +++
 28 files changed, 248 insertions(+), 773 deletions(-)
 delete mode 100644 app-admin/conky/conky-1.11.6-r1.ebuild
 delete mode 100644 dev-python/owslib/owslib-0.17.1-r1.ebuild
 delete mode 100644 dev-python/pyproj/files/pyproj-2.4.2-conftest.patch
 delete mode 100644 dev-python/pyproj/pyproj-2.4.2-r1.ebuild
 rename dev-qt/qtnetwork/{qtnetwork-5.15.1.ebuild => qtnetwork-5.15.1-r1.ebuild} (96%)
 delete mode 100644 kde-apps/kdav/Manifest
 delete mode 100644 kde-apps/kdav/kdav-20.04.3.ebuild
 delete mode 100644 kde-apps/kdav/metadata.xml
 delete mode 100644 kde-plasma/discover/discover-5.20.3.ebuild
 delete mode 100644 sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch
 create mode 100644 sci-geosciences/qgis/files/qgis-9999-default-qmldir.patch
 create mode 100644 sci-geosciences/qgis/files/qgis-9999-featuresummary.patch
 delete mode 100644 sci-geosciences/qgis/qgis-3.10.9.ebuild
 delete mode 100644 sys-boot/unetbootin/files/unetbootin-581-desktop.patch
 delete mode 100644 sys-boot/unetbootin/unetbootin-661.ebuild
 create mode 100644 sys-kernel/gentoo-sources/gentoo-sources-4.14.207.ebuild
 create mode 100644 sys-kernel/gentoo-sources/gentoo-sources-4.19.158.ebuild
 create mode 100644 sys-kernel/gentoo-sources/gentoo-sources-4.4.244.ebuild
 create mode 100644 sys-kernel/gentoo-sources/gentoo-sources-4.9.244.ebuild
 create mode 100644 sys-kernel/gentoo-sources/gentoo-sources-5.4.78.ebuild
 create mode 100644 sys-kernel/gentoo-sources/gentoo-sources-5.9.9.ebuild
*** 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